From a28f2dd07cafbbb136712cc1c75b89f494fa702f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 25 Feb 2010 07:58:15 +0000 Subject: Move digestgen to portage.util.digestgen. svn path=/main/trunk/; revision=15454 --- bin/repoman | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bin/repoman') diff --git a/bin/repoman b/bin/repoman index c1f1481d..9f2d88c5 100755 --- a/bin/repoman +++ b/bin/repoman @@ -77,6 +77,7 @@ from portage.output import bold, create_color_func, darkgreen, \ green, nocolor, red, turquoise, yellow from portage.output import ConsoleStyleFile, StyleWriter from portage.util import cmp_sort_key, writemsg_level +from portage.util.digestgen import digestgen if sys.hexversion >= 0x3000000: basestring = str @@ -1011,7 +1012,7 @@ for x in scanlist: portage._doebuild_manifest_exempt_depend -= 1 repoman_settings["O"] = checkdir - if not portage.digestgen(mysettings=repoman_settings, myportdb=portdb): + if not digestgen(mysettings=repoman_settings, myportdb=portdb): print("Unable to generate manifest.") dofail = 1 if options.mode == "manifest": @@ -2335,7 +2336,7 @@ else: mydone=[] if repolevel==3: # In a package dir repoman_settings["O"] = startdir - portage.digestgen(mysettings=repoman_settings, myportdb=portdb) + digestgen(mysettings=repoman_settings, myportdb=portdb) elif repolevel==2: # In a category dir for x in myfiles: xs=x.split("/") @@ -2349,7 +2350,7 @@ else: repoman_settings["O"] = os.path.join(startdir, xs[0]) if not os.path.isdir(repoman_settings["O"]): continue - portage.digestgen(mysettings=repoman_settings, myportdb=portdb) + digestgen(mysettings=repoman_settings, myportdb=portdb) elif repolevel==1: # repo-cvsroot print(green("RepoMan sez:"), "\"You're rather crazy... doing the entire repository.\"\n") for x in myfiles: @@ -2364,7 +2365,7 @@ else: repoman_settings["O"] = os.path.join(startdir, xs[0], xs[1]) if not os.path.isdir(repoman_settings["O"]): continue - portage.digestgen(mysettings=repoman_settings, myportdb=portdb) + digestgen(mysettings=repoman_settings, myportdb=portdb) else: print(red("I'm confused... I don't know where I am!")) sys.exit(1) -- cgit v1.2.3