Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 171777 Details for
Bug 173284
etc-update should ignore ".svn" and ".cvs" directories (and maybe others)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
make etc-update and dispatch-conf ignore hidden directories
ignore_hidden_dirs.patch (text/plain), 2.28 KB, created by
Zac Medico
on 2008-11-15 06:07:31 UTC
(
hide
)
Description:
make etc-update and dispatch-conf ignore hidden directories
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2008-11-15 06:07:31 UTC
Size:
2.28 KB
patch
obsolete
>Index: bin/dispatch-conf >=================================================================== >--- bin/dispatch-conf (revision 11927) >+++ bin/dispatch-conf (revision 11929) >@@ -28,7 +28,7 @@ > from portage import dispatch_conf > from portage.process import find_binary > >-FIND_EXTANT_CONFIGS = "find '%s' %s -iname '._cfg????_%s' ! -iname '.*~' ! -iname '.*.bak'" >+FIND_EXTANT_CONFIGS = "find '%s' %s -name '._cfg????_%s' ! -name '.*~' ! -iname '.*.bak' -print" > DIFF_CONTENTS = "diff -Nu '%s' '%s'" > DIFF_CVS_INTERP = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '# .Header:.*'" > DIFF_WSCOMMENTS = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '^[-+]#' | grep -v '^[-+][:space:]*$'" >@@ -93,11 +93,12 @@ > except OSError: > continue > basename = "*" >- find_opts = "" >+ find_opts = "-name '.*' -type d -prune -o" > if not stat.S_ISDIR(mymode): > path, basename = os.path.split(path) > find_opts = "-maxdepth 1" > >+ print FIND_EXTANT_CONFIGS % (path, find_opts, basename) > confs += self.massage(os.popen(FIND_EXTANT_CONFIGS % (path, find_opts, basename)).readlines()) > > if self.options['use-rcs'] == 'yes': >Index: bin/etc-update >=================================================================== >--- bin/etc-update (revision 11927) >+++ bin/etc-update (revision 11929) >@@ -50,17 +50,19 @@ > > for path in ${CONFIG_PROTECT} ; do > path="${ROOT}${path}" >- find_opts="-iname ._cfg????_*" >+ # Do not traverse hidden directories such as .svn or .git. >+ find_opts="-name .* -type d -prune -o -name ._cfg????_*" > if [ ! -d "${path}" ]; then > [ ! -f "${path}" ] && continue > my_basename="${path##*/}" > path="${path%/*}" >- find_opts="-maxdepth 1 -iname ._cfg????_${my_basename}" >+ find_opts="-maxdepth 1 -name ._cfg????_${my_basename}" > fi > > ofile="" > # The below set -f turns off file name globbing in the ${find_opts} expansion. >- for file in $(set -f; find ${path}/ ${find_opts} ! -iname '.*~' ! -iname '.*.bak' | >+ for file in $(set -f ; find ${path}/ ${find_opts} \ >+ ! -name '.*~' ! -iname '.*.bak' -print | > sed -e "s:\(^.*/\)\(\._cfg[0-9]*_\)\(.*$\):\1\2\3\%\2\%\3:" | > sort -t'%' -k3 -k2 | LANG=POSIX LC_ALL=POSIX cut -f1 -d'%'); do >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 173284
: 171777