For bug #186610, use `find <path>` to scan for config updates since `cd <path>` could...
authorZac Medico <zmedico@gentoo.org>
Mon, 30 Jul 2007 07:00:22 +0000 (07:00 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 30 Jul 2007 07:00:22 +0000 (07:00 -0000)
svn path=/main/branches/2.1.2.9/; revision=7506

bin/emerge

index b338febcaf87c398b4ca9a3fb57a0762267cc8ea..6a4260ca37ad9b597d0c4cb5b4fe1054a2e99e6d 100755 (executable)
@@ -3836,17 +3836,17 @@ def chk_updated_cfg_files(target_root, config_protect):
                        except OSError:
                                continue
                        if stat.S_ISDIR(mymode):
-                               mycommand = "cd '%s'; find . -iname '._cfg????_*'" % x
+                               mycommand = "find '%s' -iname '._cfg????_*'" % x
                        else:
-                               mycommand = "cd '%s'; find . -maxdepth 1 -iname '._cfg????_%s'" % \
+                               mycommand = "find '%s' -maxdepth 1 -iname '._cfg????_%s'" % \
                                        os.path.split(x.rstrip(os.path.sep))
                        a = commands.getstatusoutput(mycommand + \
-                               " ! -iname '.*~' ! -iname '.*.bak'")
+                               " ! -iname '.*~' ! -iname '.*.bak' -print0")
                        if a[0] != 0:
                                print >> sys.stderr, " " + bad("*")+ " error scanning '%s'" % x
                        else:
-                               files = a[1].split()
-                               if files:
+                               files = a[1].split('\0')
+                               if files != ['']:
                                        procount += 1
                                        print colorize("WARN", " * IMPORTANT:"),
                                        if stat.S_ISDIR(mymode):