173284 2007-04-03 20:36 0000 etc-update should ignore ".svn" and ".cvs" directories (and maybe others) 2008-11-27 20:04:30 0000 1 1 1 Unclassified Portage Development Tools unspecified All Linux RESOLVED FIXED InSVN P2 enhancement --- 210077 216231 1 tps@vr-web.de dev-portage@gentoo.org remy.blank@pobox.com tps@vr-web.de 2007-04-03 20:36:22 0000 etc-update searches ".svn" and ".cvs" directories, but since these hold things not intended for updates etc-update should ignore them. Maybe there are others to be ignored for other revision control systems or deployment platforms. CONFIG_PROTECT is not adequate to keep etc-update out of ".svn" or ".cvs". In my opinion it would be best to have an additional environment variable giving a list of directories files to be ignored. Ideally one which allows to set patterns. It may be enough to set find_opts="-iname ._cfg????_*" to find_opts="\( -iname .svn -prune \) -o -iname ._cfg????_*" to make it happen. But it would be more usefull to have it configurable. With a default of ignoring ".svn" and ".cvs". Reproducible: Always Steps to Reproduce: 1. make /etc a svn or cvs checkout 2. 3. Actual Results: ".svn" or ".cvs" is searched for "._cfg????_*" files, but these directories may not be searched at all, since they are used by svn or cvs. Expected Results: ".svn" or ".cvs" directories being ignored. robbat2@gentoo.org 2007-04-03 22:21:52 0000 Not an infra bug. etc-update is part of portage. vapier@gentoo.org 2007-04-03 22:47:24 0000 wtf is a ".cvs" directory ? cvs uses "CVS" wonder if we can just be like any other tool ... ignore directories that start with a . i dont think anything installs a . dir on purpose ... remy.blank@pobox.com 2007-05-05 08:16:30 0000 This might be related to #164529. But I still don't get what the problem really is (other than cosmetic and possibly in execution time). tps@vr-web.de 2007-05-05 20:04:24 0000 Assume people using svn, cvs, or others to configure systems. Some centralized system management software does the same. etc-update should ignore repository files. remy.blank@pobox.com 2007-05-06 10:53:53 0000 Well, yes, I'm also using Subversion for /etc, but I don't have any problem with etc-update. Could you describe precisely the behavior that's bothering you? webmaster@korten-privat.de 2008-03-08 16:25:17 0000 I am having the same problem. I just had the case that etc-update updated a file in a .svn directory (/etc/php/apache2-php5/.svn/text-base/php.ini.svn-base) this messed up my whole subversion history because now subversion was missing a file (the one with the number in front that etc-update normally uses as temporary files), I had to completely wipe all .svn directories below /etc/, delete the old subversion repository and create a new one. the problem probably occurs when subversion starts to track local changes in one of the temporary files. I also agree that we need an option in etc-update.conf. e.g.: # versioning system users # ignore versioning system diectories e.g. .svn for subversion ignore_dirs=".svn" zmedico@gentoo.org 2008-11-15 06:07:31 0000 Created an attachment (id=171777) make etc-update and dispatch-conf ignore hidden directories Both etc-update and dispatch-conf ignore hidden directories, in svn r11927:11929. zmedico@gentoo.org 2008-11-22 05:50:49 0000 This is fixed in 2.2_rc15. 171777 2008-11-15 06:07 0000 make etc-update and dispatch-conf ignore hidden directories ignore_hidden_dirs.patch text/plain SW5kZXg6IGJpbi9kaXNwYXRjaC1jb25mCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGJpbi9kaXNwYXRjaC1jb25m CShyZXZpc2lvbiAxMTkyNykKKysrIGJpbi9kaXNwYXRjaC1jb25mCShyZXZpc2lvbiAxMTkyOSkK QEAgLTI4LDcgKzI4LDcgQEAKIGZyb20gcG9ydGFnZSBpbXBvcnQgZGlzcGF0Y2hfY29uZgogZnJv bSBwb3J0YWdlLnByb2Nlc3MgaW1wb3J0IGZpbmRfYmluYXJ5CiAKLUZJTkRfRVhUQU5UX0NPTkZJ R1MgID0gImZpbmQgJyVzJyAlcyAtaW5hbWUgJy5fY2ZnPz8/P18lcycgISAtaW5hbWUgJy4qficg ISAtaW5hbWUgJy4qLmJhayciCitGSU5EX0VYVEFOVF9DT05GSUdTICA9ICJmaW5kICclcycgJXMg LW5hbWUgJy5fY2ZnPz8/P18lcycgISAtbmFtZSAnLip+JyAhIC1pbmFtZSAnLiouYmFrJyAtcHJp bnQiCiBESUZGX0NPTlRFTlRTICAgICAgICA9ICJkaWZmIC1OdSAnJXMnICclcyciCiBESUZGX0NW U19JTlRFUlAgICAgICA9ICJkaWZmIC1OdSAnJXMnICclcycgfCBncmVwICdeWystXVteKy1dJyB8 IGdyZXAgLXYgJyMgLkhlYWRlcjouKiciCiBESUZGX1dTQ09NTUVOVFMgICAgICA9ICJkaWZmIC1O dSAnJXMnICclcycgfCBncmVwICdeWystXVteKy1dJyB8IGdyZXAgLXYgJ15bLStdIycgfCBncmVw IC12ICdeWy0rXVs6c3BhY2U6XSokJyIKQEAgLTkzLDExICs5MywxMiBAQAogICAgICAgICAgICAg ZXhjZXB0IE9TRXJyb3I6CiAgICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAgIGJh c2VuYW1lID0gIioiCi0gICAgICAgICAgICBmaW5kX29wdHMgPSAiIgorICAgICAgICAgICAgZmlu ZF9vcHRzID0gIi1uYW1lICcuKicgLXR5cGUgZCAtcHJ1bmUgLW8iCiAgICAgICAgICAgICBpZiBu b3Qgc3RhdC5TX0lTRElSKG15bW9kZSk6CiAgICAgICAgICAgICAgICAgcGF0aCwgYmFzZW5hbWUg PSBvcy5wYXRoLnNwbGl0KHBhdGgpCiAgICAgICAgICAgICAgICAgZmluZF9vcHRzID0gIi1tYXhk ZXB0aCAxIgogCisgICAgICAgICAgICBwcmludCBGSU5EX0VYVEFOVF9DT05GSUdTICUgKHBhdGgs IGZpbmRfb3B0cywgYmFzZW5hbWUpCiAgICAgICAgICAgICBjb25mcyArPSBzZWxmLm1hc3NhZ2Uo b3MucG9wZW4oRklORF9FWFRBTlRfQ09ORklHUyAlIChwYXRoLCBmaW5kX29wdHMsIGJhc2VuYW1l KSkucmVhZGxpbmVzKCkpCiAKICAgICAgICAgaWYgc2VsZi5vcHRpb25zWyd1c2UtcmNzJ10gPT0g J3llcyc6CkluZGV4OiBiaW4vZXRjLXVwZGF0ZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBiaW4vZXRjLXVwZGF0 ZQkocmV2aXNpb24gMTE5MjcpCisrKyBiaW4vZXRjLXVwZGF0ZQkocmV2aXNpb24gMTE5MjkpCkBA IC01MCwxNyArNTAsMTkgQEAKIAogCWZvciBwYXRoIGluICR7Q09ORklHX1BST1RFQ1R9IDsgZG8K IAkJcGF0aD0iJHtST09UfSR7cGF0aH0iCi0JCWZpbmRfb3B0cz0iLWluYW1lIC5fY2ZnPz8/P18q IgorCQkjIERvIG5vdCB0cmF2ZXJzZSBoaWRkZW4gZGlyZWN0b3JpZXMgc3VjaCBhcyAuc3ZuIG9y IC5naXQuCisJCWZpbmRfb3B0cz0iLW5hbWUgLiogLXR5cGUgZCAtcHJ1bmUgLW8gLW5hbWUgLl9j Zmc/Pz8/XyoiCiAJCWlmIFsgISAtZCAiJHtwYXRofSIgXTsgdGhlbgogCQkJWyAhIC1mICIke3Bh dGh9IiBdICYmIGNvbnRpbnVlCiAJCQlteV9iYXNlbmFtZT0iJHtwYXRoIyMqL30iCiAJCQlwYXRo PSIke3BhdGglLyp9IgotCQkJZmluZF9vcHRzPSItbWF4ZGVwdGggMSAtaW5hbWUgLl9jZmc/Pz8/ XyR7bXlfYmFzZW5hbWV9IgorCQkJZmluZF9vcHRzPSItbWF4ZGVwdGggMSAtbmFtZSAuX2NmZz8/ Pz9fJHtteV9iYXNlbmFtZX0iCiAJCWZpCiAKIAkJb2ZpbGU9IiIKIAkJIyBUaGUgYmVsb3cgc2V0 IC1mIHR1cm5zIG9mZiBmaWxlIG5hbWUgZ2xvYmJpbmcgaW4gdGhlICR7ZmluZF9vcHRzfSBleHBh bnNpb24uCi0JCWZvciBmaWxlIGluICQoc2V0IC1mOyBmaW5kICR7cGF0aH0vICR7ZmluZF9vcHRz fSAhIC1pbmFtZSAnLip+JyAhIC1pbmFtZSAnLiouYmFrJyB8CisJCWZvciBmaWxlIGluICQoc2V0 IC1mIDsgZmluZCAke3BhdGh9LyAke2ZpbmRfb3B0c30gXAorCQkgICAgICAgISAtbmFtZSAnLip+ JyAhIC1pbmFtZSAnLiouYmFrJyAtcHJpbnQgfAogCQkJICAgc2VkIC1lICJzOlwoXi4qL1wpXChc Ll9jZmdbMC05XSpfXClcKC4qJFwpOlwxXDJcM1wlXDJcJVwzOiIgfAogCQkJICAgc29ydCAtdCcl JyAtazMgLWsyIHwgTEFORz1QT1NJWCBMQ19BTEw9UE9TSVggY3V0IC1mMSAtZCclJyk7IGRvCiAK