2020-10-23T14:30:01Z

1 files changed, 80 insertions, 30 deletions

diff --git a/src_prepare-overlay.html b/src_prepare-overlay.html
index 02d82a30d333..0ea0b7833aed 100644
--- a/src_prepare-overlay.html
+++ b/src_prepare-overlay.html
@@ -34,65 +34,115 @@
 </pre></td></tr>
             <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>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>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).
 </pre></td></tr>
-            <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
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>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).
 </pre></td></tr>
-            <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,
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>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).
 </pre></td></tr>
-            <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
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>From https://gitlab.com/src_prepare/src_prepare-overlay
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>   8b289ac..18e8939  master     -&gt; origin/master
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating 8b289ac..18e8939
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>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).
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> www-client/palemoon/palemoon-28.12.0.ebuild | 252 ----------------------------
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> www-client/palemoon/palemoon-28.13.0.ebuild |   8 +-
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> www-client/palemoon/palemoon-28.14.2.ebuild |   8 +-
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> www-client/palemoon/palemoon-9999.ebuild    |   8 +-
+            <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> 4 files changed, 12 insertions(+), 264 deletions(-)
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> delete mode 100644 www-client/palemoon/palemoon-28.12.0.ebuild
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing src_prepare-overlay
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** synced src_prepare-overlay
+            <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> * Sync succeeded
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </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
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </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 1 src_prepare-overlay
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully
+            <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>From https://gitlab.com/src_prepare/src_prepare-overlay
+</pre></td></tr>
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>   18e8939..007a7a0  master     -&gt; origin/master
+</pre></td></tr>
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating 18e8939..007a7a0
+</pre></td></tr>
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Fast-forward
+</pre></td></tr>
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> app-portage/euscan-ng/Manifest               |  1 +
+</pre></td></tr>
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> app-portage/euscan-ng/euscan-ng-1.0.0.ebuild | 47 ++++++++++++++++++++++++++++
+</pre></td></tr>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> app-portage/euscan-ng/euscan-ng-9999.ebuild  |  3 +-
+</pre></td></tr>
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> app-portage/gen-pkgs/Manifest                |  1 +
+</pre></td></tr>
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> app-portage/gen-pkgs/gen-pkgs-1.0.0.ebuild   | 33 +++++++++++++++++++
+</pre></td></tr>
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> app-portage/gen-pkgs/gen-pkgs-9999.ebuild    |  2 --
+</pre></td></tr>
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> net-firewall/hblock/hblock-2.1.5.ebuild      |  3 +-
+</pre></td></tr>
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> net-firewall/hblock/hblock-2.1.7.ebuild      |  3 +-
+</pre></td></tr>
+            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> net-firewall/hblock/hblock-9999.ebuild       |  3 +-
+</pre></td></tr>
+            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> 9 files changed, 86 insertions(+), 10 deletions(-)
+</pre></td></tr>
+            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> create mode 100644 app-portage/euscan-ng/Manifest
+</pre></td></tr>
+            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> create mode 100644 app-portage/euscan-ng/euscan-ng-1.0.0.ebuild
+</pre></td></tr>
+            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> create mode 100644 app-portage/gen-pkgs/Manifest
+</pre></td></tr>
+            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> create mode 100644 app-portage/gen-pkgs/gen-pkgs-1.0.0.ebuild
+</pre></td></tr>
+            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>*** syncing src_prepare-overlay
+</pre></td></tr>
+            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** synced src_prepare-overlay
+</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 1 src_prepare-overlay
+</pre></td></tr>
+            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>