diff options
| -rw-r--r-- | R_Overlay.html | 4 | ||||
| -rw-r--r-- | R_Overlay.txt | 4 | ||||
| -rw-r--r-- | devpump-gor.html | 48 | ||||
| -rw-r--r-- | devpump-gor.txt | 1 | ||||
| -rw-r--r-- | displacer.html | 44 | ||||
| -rw-r--r-- | displacer.txt | 1 | ||||
| -rw-r--r-- | dlang.html | 44 | ||||
| -rw-r--r-- | dlang.txt | 1 | ||||
| -rw-r--r-- | docker.html | 78 | ||||
| -rw-r--r-- | docker.txt | 1 | ||||
| -rw-r--r-- | fidonet.html | 2 | ||||
| -rw-r--r-- | fidonet.txt | 2 | ||||
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | mate-de-gentoo.html | 98 | ||||
| -rw-r--r-- | mate-de-gentoo.txt | 29 | ||||
| -rw-r--r-- | myrvolay.html | 28 | ||||
| -rw-r--r-- | myrvolay.txt | 8 | ||||
| -rw-r--r-- | swegener.html | 2 | ||||
| -rw-r--r-- | swegener.txt | 2 | ||||
| -rw-r--r-- | vapoursynth.html | 44 | ||||
| -rw-r--r-- | vapoursynth.txt | 1 | ||||
| -rw-r--r-- | vayerx.html | 66 | ||||
| -rw-r--r-- | vayerx.txt | 1 | ||||
| -rw-r--r-- | vdr-devel.html | 44 | ||||
| -rw-r--r-- | vdr-devel.txt | 1 | ||||
| -rw-r--r-- | waffle-builds.html | 44 | ||||
| -rw-r--r-- | waffle-builds.txt | 1 | ||||
| -rw-r--r-- | wayland-desktop.html | 44 | ||||
| -rw-r--r-- | wayland-desktop.txt | 1 | ||||
| -rw-r--r-- | wbrana.html | 44 | ||||
| -rw-r--r-- | wbrana.txt | 1 | ||||
| -rw-r--r-- | xwing.html | 58 | ||||
| -rw-r--r-- | xwing.txt | 23 | ||||
| -rw-r--r-- | zugaina.html | 8 | ||||
| -rw-r--r-- | zugaina.txt | 8 |
35 files changed, 307 insertions, 481 deletions
diff --git a/R_Overlay.html b/R_Overlay.html index 094295379f53..c829b8c5fda5 100644 --- a/R_Overlay.html +++ b/R_Overlay.html @@ -50,7 +50,7 @@ </pre></td></tr> <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.28M + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.19M </pre></td></tr> <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> @@ -62,7 +62,7 @@ </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>sent 17.43K bytes received 2.56M bytes 1.72M bytes/sec + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.43K bytes received 2.56M bytes 1.03M bytes/sec </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 59.03M speedup is 22.91 </pre></td></tr> diff --git a/R_Overlay.txt b/R_Overlay.txt index 97d54ff39674..6e511f4946c7 100644 --- a/R_Overlay.txt +++ b/R_Overlay.txt @@ -18,13 +18,13 @@ Total file size: 59.03M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 2.28M +File list size: 2.19M File list generation time: 0.001 seconds File list transfer time: 0.000 seconds Total bytes sent: 17.43K Total bytes received: 2.56M -sent 17.43K bytes received 2.56M bytes 1.72M bytes/sec +sent 17.43K bytes received 2.56M bytes 1.03M bytes/sec total size is 59.03M speedup is 22.91 *** syncing R_Overlay *** synced R_Overlay diff --git a/devpump-gor.html b/devpump-gor.html index 576ec1dd16a7..1c58af98bd05 100644 --- a/devpump-gor.html +++ b/devpump-gor.html @@ -32,53 +32,51 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync devpump-gor </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" 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: Pulling without specifying how to reconcile divergent branches is + <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>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>commands sometime before your next pull: </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> </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> 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> git config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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> git config pull.ff only # fast-forward only + <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> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </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>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>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>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>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>invocation. </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> </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>Already up to date. </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing devpump-gor </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing devpump-gor + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced devpump-gor </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced devpump-gor + <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> * Sync succeeded + <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>$ git log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 devpump-gor </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 devpump-gor -</pre></td></tr> - <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-tv/popcorntime-bin-0.3.8.0: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * media-tv/popcorntime-bin-0.3.8.0: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-tv/popcorntime-bin-0.3.8.3: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass + <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-tv/popcorntime-bin-0.3.8.3: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</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/devpump-gor.txt b/devpump-gor.txt index 95a661e838ab..9516be80195d 100644 --- a/devpump-gor.txt +++ b/devpump-gor.txt @@ -9,7 +9,6 @@ 'uri': 'https://github.com/DevPump/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync devpump-gor -WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/displacer.html b/displacer.html index 45e91e4760fd..dda3b47dcef5 100644 --- a/displacer.html +++ b/displacer.html @@ -42,47 +42,49 @@ </pre></td></tr> <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>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', 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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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> git config pull.rebase false # merge (the default strategy) + <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 config pull.rebase true # rebase + <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 config pull.ff only # fast-forward only + <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> + <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>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </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 + <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>invocation. + <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> + <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>Already up to date. + <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>*** syncing displacer + <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 displacer + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing displacer </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded + <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>$ git log --format=%ci -1 + <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 show -q --pretty=format:%G? HEAD + <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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 displacer + <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> * Cache regenerated successfully + <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> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/displacer.txt b/displacer.txt index ebe7ce826048..1c401ea40ead 100644 --- a/displacer.txt +++ b/displacer.txt @@ -14,6 +14,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/displacer.git'}], 'status': 'unofficial'} $ pmaint sync displacer +WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/dlang.html b/dlang.html index 4ed7c9e27804..1b67a3d2467c 100644 --- a/dlang.html +++ b/dlang.html @@ -34,47 +34,49 @@ </pre></td></tr> <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>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:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', 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: 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>commands sometime before your next pull: + <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> + <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> git config pull.rebase false # merge (the default strategy) + <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 config pull.rebase true # rebase + <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 config pull.ff only # fast-forward only + <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> + <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>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> </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>You can replace "git config" with "git config --global" to set a default </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>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>invocation. + <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> + <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>Already up to date. + <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>*** syncing dlang + <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 dlang + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing dlang </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 dlang </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 dlang + <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 dlang +</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/dlang.txt b/dlang.txt index 72f7ce9719f0..8e082494f5c1 100644 --- a/dlang.txt +++ b/dlang.txt @@ -10,6 +10,7 @@ {'type': 'git', 'uri': 'git://github.com/gentoo/dlang.git'}], 'status': 'unofficial'} $ pmaint sync dlang +WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/docker.html b/docker.html index 46f3d7566846..58d987f10401 100644 --- a/docker.html +++ b/docker.html @@ -40,83 +40,81 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync docker </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" 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: Pulling without specifying how to reconcile divergent branches is + <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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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 config pull.rebase false # merge (the default strategy) + <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 config pull.rebase true # rebase + <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 config pull.ff only # fast-forward only + <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> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <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> + <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>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing docker </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing docker + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced docker </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced docker + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 docker </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 docker -</pre></td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-emulation/docker-0.5.3: 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> * app-emulation/docker-0.5.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-emulation/docker-0.6.0: 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> * app-emulation/docker-0.6.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-emulation/docker-0.6.1-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-emulation/docker-0.6.1-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-emulation/docker-0.6.1-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-emulation/docker-0.6.1-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-emulation/docker-0.6.1-r3: 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> * app-emulation/docker-0.6.1-r3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-emulation/docker-0.6.1-r4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-emulation/docker-0.6.1-r4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-emulation/docker-0.6.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-emulation/docker-0.6.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-emulation/docker-0.6.2-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-emulation/docker-0.6.2-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-emulation/docker-0.6.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-emulation/docker-0.6.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-emulation/docker-0.6.3-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-emulation/docker-0.6.3-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-emulation/docker-0.6.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-emulation/docker-0.6.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-emulation/docker-0.6.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-emulation/docker-0.6.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-emulation/docker-0.6.6: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-emulation/docker-0.6.6: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-emulation/docker-0.6.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-emulation/docker-0.6.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-emulation/docker-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-emulation/docker-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-util/gordon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-util/gordon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * sys-auth/notary-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * sys-auth/notary-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </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="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/docker.txt b/docker.txt index bc05b0a7e596..dfeaf29f0af0 100644 --- a/docker.txt +++ b/docker.txt @@ -13,7 +13,6 @@ {'type': 'git', 'uri': 'git@github.com:tianon/docker-overlay.git'}], 'status': 'unofficial'} $ pmaint sync docker -WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/fidonet.html b/fidonet.html index be839c3f1ac5..19a0e7b2bf53 100644 --- a/fidonet.html +++ b/fidonet.html @@ -64,7 +64,7 @@ </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>sent 85 bytes received 134 bytes 87.60 bytes/sec + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 85 bytes received 134 bytes 62.57 bytes/sec </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 32 speedup is 0.15 </pre></td></tr> diff --git a/fidonet.txt b/fidonet.txt index f092d6b98946..cf62c88ccfb5 100644 --- a/fidonet.txt +++ b/fidonet.txt @@ -25,7 +25,7 @@ File list transfer time: 0.000 seconds Total bytes sent: 85 Total bytes received: 134 -sent 85 bytes received 134 bytes 87.60 bytes/sec +sent 85 bytes received 134 bytes 62.57 bytes/sec total size is 32 speedup is 0.15 *** syncing fidonet *** synced fidonet diff --git a/index.html b/index.html index 5a521b74feea..2c45103660f3 100644 --- a/index.html +++ b/index.html @@ -921,7 +921,7 @@ </table> - <address>Generated based on results from 2021-02-11 11:07:24 UTC</address> + <address>Generated based on results from 2021-02-11 11:22:24 UTC</address> </body> </html>
\ No newline at end of file diff --git a/mate-de-gentoo.html b/mate-de-gentoo.html index f89e492c35d2..a482bf88c2c1 100644 --- a/mate-de-gentoo.html +++ b/mate-de-gentoo.html @@ -58,103 +58,49 @@ </pre></td></tr> <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>From https://github.com/oz123/mate-de-gentoo + <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> 89574ed..bae591d master -> origin/master + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing mate-de-gentoo </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Updating 89574ed..bae591d + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced mate-de-gentoo </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Fast-forward + <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> dev-python/python-caja/Manifest | 5 -- + <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> dev-python/python-caja/python-caja-1.20.2.ebuild | 47 ----------- + <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> .../python-caja/python-caja-1.22.0-r1.ebuild | 47 ----------- + <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 mate-de-gentoo </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> dev-python/python-caja/python-caja-1.22.1.ebuild | 47 ----------- -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> dev-python/python-caja/python-caja-1.23.0.ebuild | 47 ----------- -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-python/python-caja/python-caja-1.23.1.ebuild | 48 ----------- -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-python/python-caja/python-caja-9999.ebuild | 6 +- -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> mate-base/caja/Manifest | 5 -- -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> mate-base/caja/caja-1.20.3-r2.ebuild | 96 ---------------------- -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> mate-base/caja/caja-1.22.1.ebuild | 90 -------------------- -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> mate-base/caja/caja-1.22.2.ebuild | 90 -------------------- -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> mate-base/caja/caja-1.23.2.ebuild | 90 -------------------- -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> mate-base/caja/caja-1.23.4.ebuild | 88 -------------------- -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> 13 files changed, 3 insertions(+), 703 deletions(-) -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> delete mode 100644 dev-python/python-caja/python-caja-1.20.2.ebuild -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> delete mode 100644 dev-python/python-caja/python-caja-1.22.0-r1.ebuild -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> delete mode 100644 dev-python/python-caja/python-caja-1.22.1.ebuild -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> delete mode 100644 dev-python/python-caja/python-caja-1.23.0.ebuild -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> delete mode 100644 dev-python/python-caja/python-caja-1.23.1.ebuild -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> delete mode 100644 mate-base/caja/caja-1.20.3-r2.ebuild -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> delete mode 100644 mate-base/caja/caja-1.22.1.ebuild -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> delete mode 100644 mate-base/caja/caja-1.22.2.ebuild -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> delete mode 100644 mate-base/caja/caja-1.23.2.ebuild -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> delete mode 100644 mate-base/caja/caja-1.23.4.ebuild -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing mate-de-gentoo -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced mate-de-gentoo -</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 mate-de-gentoo -</pre></td></tr> - <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * mate-base/mate-applets-1.20.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * mate-base/mate-applets-1.20.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * mate-base/mate-applets-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * mate-base/mate-applets-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * mate-base/mate-menus-1.20.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * mate-base/mate-menus-1.20.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * mate-base/mate-menus-1.20.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * mate-base/mate-menus-1.20.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * mate-base/mate-menus-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * mate-base/mate-menus-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * mate-extra/caja-dropbox-1.20.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * mate-extra/caja-dropbox-1.20.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * mate-extra/caja-dropbox-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * mate-extra/caja-dropbox-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * x11-libs/bamf-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * x11-libs/bamf-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * x11-misc/mate-dock-applet-0.87: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * x11-misc/mate-dock-applet-0.87: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * x11-misc/mozo-1.22.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * x11-misc/mozo-1.22.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * x11-misc/mozo-1.22.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * x11-misc/mozo-1.22.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * x11-misc/mozo-1.23.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * x11-misc/mozo-1.23.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * x11-misc/mozo-1.24.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * x11-misc/mozo-1.24.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * x11-misc/mozo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * x11-misc/mozo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l73"><td><a href="#l73"><span>73</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/mate-de-gentoo.txt b/mate-de-gentoo.txt index 8978d3495090..7dd4b39daa33 100644 --- a/mate-de-gentoo.txt +++ b/mate-de-gentoo.txt @@ -22,34 +22,7 @@ preference 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://github.com/oz123/mate-de-gentoo - 89574ed..bae591d master -> origin/master -Updating 89574ed..bae591d -Fast-forward - dev-python/python-caja/Manifest | 5 -- - dev-python/python-caja/python-caja-1.20.2.ebuild | 47 ----------- - .../python-caja/python-caja-1.22.0-r1.ebuild | 47 ----------- - dev-python/python-caja/python-caja-1.22.1.ebuild | 47 ----------- - dev-python/python-caja/python-caja-1.23.0.ebuild | 47 ----------- - dev-python/python-caja/python-caja-1.23.1.ebuild | 48 ----------- - dev-python/python-caja/python-caja-9999.ebuild | 6 +- - mate-base/caja/Manifest | 5 -- - mate-base/caja/caja-1.20.3-r2.ebuild | 96 ---------------------- - mate-base/caja/caja-1.22.1.ebuild | 90 -------------------- - mate-base/caja/caja-1.22.2.ebuild | 90 -------------------- - mate-base/caja/caja-1.23.2.ebuild | 90 -------------------- - mate-base/caja/caja-1.23.4.ebuild | 88 -------------------- - 13 files changed, 3 insertions(+), 703 deletions(-) - delete mode 100644 dev-python/python-caja/python-caja-1.20.2.ebuild - delete mode 100644 dev-python/python-caja/python-caja-1.22.0-r1.ebuild - delete mode 100644 dev-python/python-caja/python-caja-1.22.1.ebuild - delete mode 100644 dev-python/python-caja/python-caja-1.23.0.ebuild - delete mode 100644 dev-python/python-caja/python-caja-1.23.1.ebuild - delete mode 100644 mate-base/caja/caja-1.20.3-r2.ebuild - delete mode 100644 mate-base/caja/caja-1.22.1.ebuild - delete mode 100644 mate-base/caja/caja-1.22.2.ebuild - delete mode 100644 mate-base/caja/caja-1.23.2.ebuild - delete mode 100644 mate-base/caja/caja-1.23.4.ebuild +Already up to date. *** syncing mate-de-gentoo *** synced mate-de-gentoo * Sync succeeded diff --git a/myrvolay.html b/myrvolay.html index 959928db6723..8090612da538 100644 --- a/myrvolay.html +++ b/myrvolay.html @@ -62,33 +62,21 @@ </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>From https://github.com/myrvogna/myrvolay + <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> c13a9d8..1436bc4 main -> origin/main + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing myrvolay </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating c13a9d8..1436bc4 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced myrvolay </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Fast-forward + <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> dev-python/unitypy/{unitypy-1.6.1.1.ebuild => unitypy-1.6.1.2.ebuild} | 0 + <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> 1 file changed, 0 insertions(+), 0 deletions(-) + <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> rename dev-python/unitypy/{unitypy-1.6.1.1.ebuild => unitypy-1.6.1.2.ebuild} (100%) + <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 myrvolay </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing myrvolay -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced myrvolay -</pre></td></tr> - <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 myrvolay -</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/myrvolay.txt b/myrvolay.txt index a5a2901d6a21..99027c7de41b 100644 --- a/myrvolay.txt +++ b/myrvolay.txt @@ -24,13 +24,7 @@ preference 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://github.com/myrvogna/myrvolay - c13a9d8..1436bc4 main -> origin/main -Updating c13a9d8..1436bc4 -Fast-forward - dev-python/unitypy/{unitypy-1.6.1.1.ebuild => unitypy-1.6.1.2.ebuild} | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - rename dev-python/unitypy/{unitypy-1.6.1.1.ebuild => unitypy-1.6.1.2.ebuild} (100%) +Already up to date. *** syncing myrvolay *** synced myrvolay * Sync succeeded diff --git a/swegener.html b/swegener.html index 9a6dccb9e07a..38b906ef8187 100644 --- a/swegener.html +++ b/swegener.html @@ -100,7 +100,7 @@ </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>sent 147 bytes received 5.39K bytes 2.21K bytes/sec + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>sent 147 bytes received 5.39K bytes 1.58K bytes/sec </pre></td></tr> <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>total size is 105.64K speedup is 19.09 </pre></td></tr> diff --git a/swegener.txt b/swegener.txt index d983286b39d7..4a99d9481978 100644 --- a/swegener.txt +++ b/swegener.txt @@ -43,7 +43,7 @@ File list transfer time: 0.000 seconds Total bytes sent: 147 Total bytes received: 5.39K -sent 147 bytes received 5.39K bytes 2.21K bytes/sec +sent 147 bytes received 5.39K bytes 1.58K bytes/sec total size is 105.64K speedup is 19.09 *** syncing swegener *** synced swegener diff --git a/vapoursynth.html b/vapoursynth.html index 8f6f0209900f..70844da46448 100644 --- a/vapoursynth.html +++ b/vapoursynth.html @@ -30,49 +30,47 @@ </pre></td></tr> <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>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" 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: Pulling without specifying how to reconcile divergent branches is + <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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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> git config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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> git config pull.ff only # fast-forward only + <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> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <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> + <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>Already up to date. + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing vapoursynth </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing vapoursynth + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced vapoursynth </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced vapoursynth + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 vapoursynth </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 vapoursynth -</pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</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/vapoursynth.txt b/vapoursynth.txt index 90a844b67bdf..1e984290ea35 100644 --- a/vapoursynth.txt +++ b/vapoursynth.txt @@ -8,7 +8,6 @@ 'uri': 'https://github.com/4re/vapoursynth-portage.git'}], 'status': 'unofficial'} $ pmaint sync vapoursynth -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/vayerx.html b/vayerx.html index aae60706bd43..33de548ffdce 100644 --- a/vayerx.html +++ b/vayerx.html @@ -38,71 +38,69 @@ </pre></td></tr> <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>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" 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: Pulling without specifying how to reconcile divergent branches is + <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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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 config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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 config pull.ff only # fast-forward only + <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> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <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> + <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>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing vayerx </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vayerx + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced vayerx </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vayerx + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 vayerx </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 vayerx -</pre></td></tr> - <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-libs/thrift-0.9.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-libs/thrift-0.9.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/elasticsearch-py-2.5.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/elasticsearch-py-2.5.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/hdfs-2.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/hdfs-2.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/portalocker-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/portalocker-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/publicsuffixlist-0.6.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/publicsuffixlist-0.6.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/py-postgresql-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/py-postgresql-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/pymssql-2.1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/pymssql-2.1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/python-json-logger-0.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/python-json-logger-0.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/radar-0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/radar-0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * games-engines/renpy-6.18.3-r667: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * games-engines/renpy-6.18.3-r667: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * x11-misc/obkey-1.0-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. + <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * x11-misc/obkey-1.0-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. </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="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/vayerx.txt b/vayerx.txt index f186a15eeacd..767e00571f0c 100644 --- a/vayerx.txt +++ b/vayerx.txt @@ -12,7 +12,6 @@ {'type': 'git', 'uri': 'git@github.com:vayerx/vayerx-gentoo.git'}], 'status': 'unofficial'} $ pmaint sync vayerx -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/vdr-devel.html b/vdr-devel.html index 8b53bd413f0e..958c6d986993 100644 --- a/vdr-devel.html +++ b/vdr-devel.html @@ -42,49 +42,47 @@ </pre></td></tr> <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>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" 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: Pulling without specifying how to reconcile divergent branches is + <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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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 config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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 config pull.ff only # fast-forward only + <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> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <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> + <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>Already up to date. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vdr-devel </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing vdr-devel + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vdr-devel </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced vdr-devel + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 vdr-devel </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 vdr-devel -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</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/vdr-devel.txt b/vdr-devel.txt index 2d214f025d16..3030c6762174 100644 --- a/vdr-devel.txt +++ b/vdr-devel.txt @@ -14,7 +14,6 @@ 'uri': 'git+ssh://git@git.gentoo.org/proj/vdr/devel.git'}], 'status': 'official'} $ pmaint sync vdr-devel -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/waffle-builds.html b/waffle-builds.html index eed035b52648..30e38e851e72 100644 --- a/waffle-builds.html +++ b/waffle-builds.html @@ -38,49 +38,47 @@ </pre></td></tr> <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>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" 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: Pulling without specifying how to reconcile divergent branches is + <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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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 config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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 config pull.ff only # fast-forward only + <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> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <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> + <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>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing waffle-builds </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing waffle-builds + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced waffle-builds </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced waffle-builds + <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> * Sync succeeded + <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 log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 waffle-builds </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 waffle-builds -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</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/waffle-builds.txt b/waffle-builds.txt index af727029972a..193e436ba689 100644 --- a/waffle-builds.txt +++ b/waffle-builds.txt @@ -12,7 +12,6 @@ 'uri': 'git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git'}], 'status': 'unofficial'} $ pmaint sync waffle-builds -WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/wayland-desktop.html b/wayland-desktop.html index 3c89d2663fd9..cd82cbcc8d4a 100644 --- a/wayland-desktop.html +++ b/wayland-desktop.html @@ -36,47 +36,49 @@ </pre></td></tr> <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>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', 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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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> git config pull.rebase false # merge (the default strategy) + <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 config pull.rebase true # rebase + <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 config pull.ff only # fast-forward only + <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> + <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>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </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 + <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>invocation. + <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> + <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>Already up to date. + <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 wayland-desktop + <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 wayland-desktop + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing wayland-desktop </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 wayland-desktop </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 wayland-desktop + <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 wayland-desktop +</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/wayland-desktop.txt b/wayland-desktop.txt index e7bc6c3389a1..fbafd8aff863 100644 --- a/wayland-desktop.txt +++ b/wayland-desktop.txt @@ -11,6 +11,7 @@ 'uri': 'git+ssh://git@github.com/bsd-ac/wayland-desktop.git'}], 'status': 'unofficial'} $ pmaint sync wayland-desktop +WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/wbrana.html b/wbrana.html index ae59f1eb38d2..73392039c2d7 100644 --- a/wbrana.html +++ b/wbrana.html @@ -40,47 +40,49 @@ </pre></td></tr> <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>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', 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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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> git config pull.rebase false # merge (the default strategy) + <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 config pull.rebase true # rebase + <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 config pull.ff only # fast-forward only + <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> + <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>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </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 + <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>invocation. + <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> + <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>Already up to date. + <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>*** syncing wbrana + <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 wbrana + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing wbrana </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 wbrana </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 wbrana + <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> * Cache regenerated successfully + <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> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/wbrana.txt b/wbrana.txt index fb7d9f8002de..16aee9684c4d 100644 --- a/wbrana.txt +++ b/wbrana.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/wbrana.git'}], 'status': 'unofficial'} $ pmaint sync wbrana +WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: diff --git a/xwing.html b/xwing.html index e7674dd270ad..d8d91812d07c 100644 --- a/xwing.html +++ b/xwing.html @@ -86,63 +86,17 @@ </pre></td></tr> <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>This is xwing.info / alderaan.xwing.info + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing xwing </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced xwing </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Server Address : 91.134.139.206 + <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>Contact Name : webmaster@xwing.info + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ stat --format=%y . </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Hardware : VPS 2016 SSD 3 + <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 xwing </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> -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Number of files: 166 (reg: 109, dir: 57) -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Number of created files: 0 -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Number of deleted files: 0 -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Number of regular files transferred: 23 -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Total file size: 128.43K bytes -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Total transferred file size: 29.53K bytes -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Literal data: 29.53K bytes -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Matched data: 0 bytes -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>File list size: 5.31K -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>File list generation time: 0.001 seconds -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>File list transfer time: 0.000 seconds -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Total bytes sent: 617 -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Total bytes received: 21.65K -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>sent 617 bytes received 21.65K bytes 6.36K bytes/sec -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>total size is 128.43K speedup is 5.77 -</pre></td></tr> - <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** syncing xwing -</pre></td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** synced xwing -</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 xwing -</pre></td></tr> - <tr class="" id="l67"><td><a href="#l67"><span>67</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/xwing.txt b/xwing.txt index 45adf5dabad3..75be30404fe6 100644 --- a/xwing.txt +++ b/xwing.txt @@ -36,29 +36,6 @@ Total bytes received: 132 sent 85 bytes received 132 bytes 86.80 bytes/sec total size is 32 speedup is 0.15 -This is xwing.info / alderaan.xwing.info - -Server Address : 91.134.139.206 -Contact Name : webmaster@xwing.info -Hardware : VPS 2016 SSD 3 - - -Number of files: 166 (reg: 109, dir: 57) -Number of created files: 0 -Number of deleted files: 0 -Number of regular files transferred: 23 -Total file size: 128.43K bytes -Total transferred file size: 29.53K bytes -Literal data: 29.53K bytes -Matched data: 0 bytes -File list size: 5.31K -File list generation time: 0.001 seconds -File list transfer time: 0.000 seconds -Total bytes sent: 617 -Total bytes received: 21.65K - -sent 617 bytes received 21.65K bytes 6.36K bytes/sec -total size is 128.43K speedup is 5.77 *** syncing xwing *** synced xwing * Sync succeeded diff --git a/zugaina.html b/zugaina.html index dead4af9e850..a0540c438778 100644 --- a/zugaina.html +++ b/zugaina.html @@ -48,21 +48,21 @@ </pre></td></tr> <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 44.12K + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 42.67K </pre></td></tr> <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 499 + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 491 </pre></td></tr> <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes received: 47.05K </pre></td></tr> <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>sent 499 bytes received 47.05K bytes 19.02K bytes/sec + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 491 bytes received 47.05K bytes 19.02K bytes/sec </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.22M speedup is 46.67 + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.22M speedup is 46.68 </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing zugaina </pre></td></tr> diff --git a/zugaina.txt b/zugaina.txt index 994dc0aa93bc..c5e3427356c9 100644 --- a/zugaina.txt +++ b/zugaina.txt @@ -17,14 +17,14 @@ Total file size: 2.22M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 44.12K +File list size: 42.67K File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 499 +Total bytes sent: 491 Total bytes received: 47.05K -sent 499 bytes received 47.05K bytes 19.02K bytes/sec -total size is 2.22M speedup is 46.67 +sent 491 bytes received 47.05K bytes 19.02K bytes/sec +total size is 2.22M speedup is 46.68 *** syncing zugaina *** synced zugaina * Sync succeeded |