From 690c890596cf646b1bc7b05ce276e0d6aabea7fc Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 26 Apr 2006 10:56:46 +0000 Subject: Pass a portdbapi instance into portage.digestgen() so that it doesn't have to use any globals. svn path=/main/trunk/; revision=3244 --- bin/repoman | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/repoman b/bin/repoman index 4cc57e297..9cbe8b68a 100755 --- a/bin/repoman +++ b/bin/repoman @@ -797,7 +797,7 @@ for x in scanlist: if mymode == "commit": repoman_settings["O"] = checkdir - portage.digestgen([], repoman_settings, manifestonly=1) + portage.digestgen([], repoman_settings, manifestonly=1, myportdb=portage.portdb) mf = Manifest(checkdir, portage.FetchlistDict(checkdir, repoman_settings, portage.portdb), @@ -1610,7 +1610,7 @@ else: mydone=[] if repolevel==3: # In a package dir repoman_settings["O"]=os.getcwd() - portage.digestgen([],repoman_settings,manifestonly=1) + portage.digestgen([], repoman_settings, manifestonly=1, myportdb=portage.portdb) elif repolevel==2: # In a category dir for x in myfiles: xs=string.split(x,"/") @@ -1620,7 +1620,7 @@ else: continue mydone.append(xs[0]) repoman_settings["O"]=os.path.join(os.getcwd(), xs[0]) - portage.digestgen([],repoman_settings,manifestonly=1) + portage.digestgen([], repoman_settings, manifestonly=1, myportdb=portage.portdb) elif repolevel==1: # repo-cvsroot print green("RepoMan sez:"), "\"You're rather crazy... doing the entire repository.\"\n" for x in myfiles: @@ -1631,7 +1631,7 @@ else: continue mydone.append(string.join(xs[:2],"/")) repoman_settings["O"]=os.path.join(os.getcwd(), x[0], x[1]) - portage.digestgen([],repoman_settings,manifestonly=1) + portage.digestgen([], repoman_settings, manifestonly=1, myportdb=portage.portdb) else: print red("I'm confused... I don't know where I am!") sys.exit(1) -- cgit v1.2.3-1-g7c22