Add missing calls to iteritems() from the last commit.
authorZac Medico <zmedico@gentoo.org>
Fri, 29 Sep 2006 00:05:35 +0000 (00:05 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 29 Sep 2006 00:05:35 +0000 (00:05 -0000)
svn path=/main/trunk/; revision=4549

bin/emerge

index 1640f6c0d90b47cce94b65f974dff7ec0b1c2aea..dd56e902357301efd475f3117f53aa59c42d6534 100755 (executable)
@@ -1939,7 +1939,7 @@ class MergeTask(object):
                                fetch_env["FEATURES"] = fetch_env.get("FEATURES", "") + " -cvs"
                                fetch_env["PORTAGE_NICENESS"] = "0"
                                fetch_args = [sys.argv[0], "--resume", "--fetchonly"]
-                               for myopt, myarg in self.myopts:
+                               for myopt, myarg in self.myopts.iteritems():
                                        if myopt not in bad_resume_opts:
                                                if myarg is True:
                                                        fetch_args.append(myopt)
@@ -2159,7 +2159,7 @@ class MergeTask(object):
                                                                mtimedb.commit()
                                                                portage.run_exitfuncs()
                                                                mynewargv=[sys.argv[0],"--resume"]
-                                                               for myopt, myarg in self.myopts:
+                                                               for myopt, myarg in self.myopts.iteritems():
                                                                        if myopt not in bad_resume_opts:
                                                                                if myarg is True:
                                                                                        mynewargv.append(myopt)