Our repo is called "portage-overlay" iso "portage".

Fix call to chk_updated_cfg_files such that we don't look (and fail) in
the root filesystem if that's not EPREFIX.

svn path=/main/branches/prefix/; revision=5016

diff --git a/bin/emerge b/bin/emerge
index 0a2bb3a9fe1256bb7a97c4075215226e66e74742..d8553c630c39b76237d7a84a67022c7d6317bbd8 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3436,6 +3436,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
                                sys.exit(retval)
                dosyncuri = syncuri
        elif syncuri[:11]=="svn+http://":
+               # this should be way more generic!
                if not os.path.exists(portage_const.EPREFIX+"/usr/bin/svn"):
                        print "!!! svn does not exist, so SVN support is disabled."
                        print "!!! Type \"emerge dev-util/subversion\" to enable SVN support."
@@ -3444,8 +3445,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
                if not os.path.exists(myportdir+"/.svn"):
                        #initial checkout
                        print ">>> Starting initial svn checkout with "+syncuri+"..."
-                       if os.path.exists(svndir+"/prefix"):
-                               print "!!! existing",svndir+"/prefix directory; exiting."
+                       if os.path.exists(svndir+"/prefix-overlay"):
+                               print "!!! existing",svndir+"/prefix-overlay directory; exiting."
                                sys.exit(1)
                        try:
                                os.rmdir(myportdir)
@@ -3458,7 +3459,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
                        if portage.spawn("cd "+svndir+"; svn checkout "+syncuri,settings,free=1):
                                print "!!! svn checkout error; exiting."
                                sys.exit(1)
-                       os.rename(os.path.join(svndir, "prefix"), myportdir)
+                       os.rename(os.path.join(svndir, "prefix-overlay"), myportdir)
                else:
                        #svn update
                        print ">>> Starting svn update..."
@@ -3494,7 +3495,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
        mypvs = portage.best(
                trees[settings["ROOT"]]["vartree"].dbapi.match("sys-apps/portage"))
 
-       chk_updated_cfg_files("/", settings.get("CONFIG_PROTECT","").split())
+       chk_updated_cfg_files(portage_const.EPREFIX, settings.get("CONFIG_PROTECT","").split())
 
        if myaction != "metadata":
                if os.access(portage.USER_CONFIG_PATH + "/bin/post_sync", os.X_OK):