diff options
| author | randomdan <randomdan@localhost> | 2008-07-22 23:06:35 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2008-07-22 23:06:35 +0000 |
| commit | 636134a17e3fbf6a9f4d19088efac925eed2e804 (patch) | |
| tree | 24d9879ae6b762f410955d99420b7b958a2466ce | |
| parent | Remove old versions and calls to functions.sh (diff) | |
| download | portage-636134a17e3fbf6a9f4d19088efac925eed2e804.tar.bz2 portage-636134a17e3fbf6a9f4d19088efac925eed2e804.tar.xz portage-636134a17e3fbf6a9f4d19088efac925eed2e804.zip | |
Fix scripts to work with multiple portage overlays and version control distfiles
| -rw-r--r-- | virtual/miller-base/Manifest | 6 | ||||
| -rwxr-xr-x | virtual/miller-base/files/hourly-distclean-updatedb.cron | 15 | ||||
| -rwxr-xr-x | virtual/miller-base/files/weekly-distclean-exec.cron | 2 | ||||
| -rw-r--r-- | virtual/miller-base/miller-base-6-r13.ebuild (renamed from virtual/miller-base/miller-base-6-r12.ebuild) | 0 |
4 files changed, 13 insertions, 10 deletions
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index e616584..df891e0 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -1,8 +1,8 @@ AUX daily-av-scan.cron 120 RMD160 734d836d94a6255fdbc02de5fe0a0bd4100bdf8b SHA1 2bee1fc40d9b1f14e12bfc927f4ba0251fc34dc7 SHA256 800eb46f54670ba4fccb0908cb2129aa8026628f64bc1753be4d234ff768d2cc AUX daily-av-update.cron 31 RMD160 17399a1386d96221b51960ec38c7059af01c609e SHA1 e4ef1c8f4d2195229da18b4d23b8a42e9b61afe8 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78 -AUX hourly-distclean-updatedb.cron 960 RMD160 74a22d7b4d4c2a26cca6c54e02835d669659fe68 SHA1 4aee5982407ce56c6a5c4a0aa6e57d65b491cdad SHA256 635a810264caf85b272a5fb24d38969ba7cecd0175740e1622158302296e9aed +AUX hourly-distclean-updatedb.cron 910 RMD160 51a5bb1ce29df2ecdd2298c958f8038a8628157c SHA1 daae4209eea324fe6ea99ea361f65303e881d67c SHA256 a47ba20cffcd4ba5bc9acbadde328432c4e88be76fc45fb86373aae96621b9fc AUX update.local.portage.cron 108 RMD160 fad8d678e8471e65394b46574a87feeffcc88060 SHA1 8fe99ccac037283de2fc6b88a24baee9b0b27281 SHA256 8b7f108841a9190de7dd0efec009b38bba3a8b1872efc931147b9bfaedc84817 AUX update.portage.cron 159 RMD160 eada35db78d363502c4d0486cfcbc8493514562f SHA1 4be58a5f236829928865c800585cc9c811a6aad3 SHA256 a910ae7e18b6e759380f1d9e30bffa100912b3a6f1c60c69f33b9cd186d0e92c AUX weekly-av-scan.cron 125 RMD160 f899ac0fd639b9f498877a518b7658a9d0d67c88 SHA1 76e0acd80e769bc7a3ff7095c274033021cabdda SHA256 c36075a5d6061813cf3c2ca0944a7c7365a3dfb313a7077f6a70ec3de0541532 -AUX weekly-distclean-exec.cron 652 RMD160 b1dc1bc05bab8019a36c0441ca3f288f6449f395 SHA1 b72fbbb41e0fbfcc9ecb415d29dabd4e05364fd0 SHA256 57a14ca5ab005a4088f568193e6145468cdc2a2bc58db572865162ff16436db9 -EBUILD miller-base-6-r12.ebuild 1429 RMD160 37facda46cd641df863970911b386bcdf75a581a SHA1 1daf17d31f380190f0924510e214c2dad3d98d4e SHA256 d08dd7bb662bb9cc82bf6ab15b68f06a69ebf66d6f7edb8b8e5386535b164558 +AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141 +EBUILD miller-base-6-r13.ebuild 1429 RMD160 37facda46cd641df863970911b386bcdf75a581a SHA1 1daf17d31f380190f0924510e214c2dad3d98d4e SHA256 d08dd7bb662bb9cc82bf6ab15b68f06a69ebf66d6f7edb8b8e5386535b164558 diff --git a/virtual/miller-base/files/hourly-distclean-updatedb.cron b/virtual/miller-base/files/hourly-distclean-updatedb.cron index 8740eba..56d11a8 100755 --- a/virtual/miller-base/files/hourly-distclean-updatedb.cron +++ b/virtual/miller-base/files/hourly-distclean-updatedb.cron @@ -7,17 +7,20 @@ WORLD="/var/lib/portage/world" DB="${DISTDIR}/.`hostname`.packagefiles" # Update timestamp on portdir overlay -for f in `find ${PORTDIR_OVERLAY}`; do - if [ ${f} -nt ${PORTDIR_OVERLAY} ]; then - touch ${PORTDIR_OVERLAY} - break; - fi +local=0 +for l in ${PORTDIR_OVERLAY}; do + for f in `find ${l}`; do + if [ ${f} -nt ${DB} ]; then + local=1; + break; + fi + done done # Compare timestamps of all considered files with database if [ ${WORLD} -nt ${DB} ] || \ [ ${PORTDIR} -nt ${DB} ] || \ - [ ${PORTDIR_OVERLAY} -nt ${DB} ] || \ + [ $local -eq 1 ] || \ [ /etc/make.conf -nt ${DB} ] || \ [ /etc/portage/packge.use -nt ${DB} ] || \ [ /etc/portage/packge.keywords -nt ${DB} ] || \ diff --git a/virtual/miller-base/files/weekly-distclean-exec.cron b/virtual/miller-base/files/weekly-distclean-exec.cron index f667110..e1b6f35 100755 --- a/virtual/miller-base/files/weekly-distclean-exec.cron +++ b/virtual/miller-base/files/weekly-distclean-exec.cron @@ -15,7 +15,7 @@ if df -l ${DISTDIR} 2> /dev/null > /dev/null ; then find ${DISTDIR} -name ".*.packagefiles" -mtime +7 -delete cat ${DISTDIR}/.*.packagefiles | sort -u > ${NEEDED} && - find ${DISTDIR} -type f -not -name ".*" -printf "%f\n" | sort -u > ${DISTGOT} && + find ${DISTDIR} -type f -maxdepth 1 -not -name ".*" -printf "%f\n" | sort -u > ${DISTGOT} && diff ${NEEDED} ${DISTGOT} | grep "> " | cut -b 3- > ${RMLIST} cd ${DISTDIR} && rm -f `cat ${RMLIST}` diff --git a/virtual/miller-base/miller-base-6-r12.ebuild b/virtual/miller-base/miller-base-6-r13.ebuild index bb0dfb5..bb0dfb5 100644 --- a/virtual/miller-base/miller-base-6-r12.ebuild +++ b/virtual/miller-base/miller-base-6-r13.ebuild |