|
Lines 2444-2449
Link Here
|
| 2444 |
# files to fetch list - avoids counting a same file twice |
2447 |
# files to fetch list - avoids counting a same file twice |
| 2445 |
# in size display (verbose mode) |
2448 |
# in size display (verbose mode) |
| 2446 |
myfetchlist=[] |
2449 |
myfetchlist=[] |
|
|
2450 |
worldlist = set(getlist(self.settings, "world")) |
| 2451 |
|
| 2447 |
for mylist_index in xrange(len(mylist)): |
2452 |
for mylist_index in xrange(len(mylist)): |
| 2448 |
x, depth, ordered = mylist[mylist_index] |
2453 |
x, depth, ordered = mylist[mylist_index] |
| 2449 |
pkg_type = x[0] |
2454 |
pkg_type = x[0] |
|
Lines 2479-2484
Link Here
|
| 2479 |
else: |
2484 |
else: |
| 2480 |
mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi |
2485 |
mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi |
| 2481 |
pkg_status = x[3] |
2486 |
pkg_status = x[3] |
|
|
2487 |
pkg_merge = ordered and pkg_status != "nomerge" |
| 2482 |
binary_package = True |
2488 |
binary_package = True |
| 2483 |
if "ebuild" == pkg_type: |
2489 |
if "ebuild" == pkg_type: |
| 2484 |
if "merge" == x[3] or \ |
2490 |
if "merge" == x[3] or \ |
|
Lines 2652-2658
Link Here
|
| 2652 |
if verbosity == 3: |
2658 |
if verbosity == 3: |
| 2653 |
# size verbose |
2659 |
# size verbose |
| 2654 |
mysize=0 |
2660 |
mysize=0 |
| 2655 |
if x[0] == "ebuild" and ordered and x[-1] != "nomerge": |
2661 |
if pkg_type == "ebuild" and pkg_merge: |
| 2656 |
try: |
2662 |
try: |
| 2657 |
myfilesdict = portdb.getfetchsizes(pkg_key, |
2663 |
myfilesdict = portdb.getfetchsizes(pkg_key, |
| 2658 |
useflags=self.useFlags[myroot][pkg_key], |
2664 |
useflags=self.useFlags[myroot][pkg_key], |
|
Lines 2712-2728
Link Here
|
| 2712 |
myoldbest=myoldbest[:-3] |
2718 |
myoldbest=myoldbest[:-3] |
| 2713 |
myoldbest=blue("["+myoldbest+"]") |
2719 |
myoldbest=blue("["+myoldbest+"]") |
| 2714 |
|
2720 |
|
|
|
2721 |
pkg_cp = xs[0] |
| 2722 |
pkg_world = pkg_cp in worldlist |
| 2723 |
|
| 2724 |
def pkgprint(pkg): |
| 2725 |
if pkg_merge: |
| 2726 |
if pkg_world: |
| 2727 |
return colorize("PKG_MERGE_WORLD", pkg) |
| 2728 |
else: |
| 2729 |
return colorize("PKG_MERGE", pkg) |
| 2730 |
else: |
| 2731 |
if pkg_world: |
| 2732 |
return colorize("PKG_NOMERGE_WORLD", pkg) |
| 2733 |
else: |
| 2734 |
return colorize("PKG_NOMERGE", pkg) |
| 2735 |
|
| 2715 |
if x[1]!="/": |
2736 |
if x[1]!="/": |
| 2716 |
if myoldbest: |
2737 |
if myoldbest: |
| 2717 |
myoldbest +=" " |
2738 |
myoldbest +=" " |
| 2718 |
if "--columns" in self.myopts: |
2739 |
if "--columns" in self.myopts: |
| 2719 |
if "--quiet" in self.myopts: |
2740 |
if "--quiet" in self.myopts: |
| 2720 |
myprint=addl+" "+indent+darkgreen(xs[0]) |
2741 |
myprint=addl+" "+indent+pkgprint(pkg_cp) |
| 2721 |
myprint=myprint+darkblue(" "+xs[1]+xs[2])+" " |
2742 |
myprint=myprint+darkblue(" "+xs[1]+xs[2])+" " |
| 2722 |
myprint=myprint+myoldbest |
2743 |
myprint=myprint+myoldbest |
| 2723 |
myprint=myprint+darkgreen("to "+x[1]) |
2744 |
myprint=myprint+darkgreen("to "+x[1]) |
| 2724 |
else: |
2745 |
else: |
| 2725 |
myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0]) |
2746 |
myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_cp) |
| 2726 |
if (newlp-nc_len(myprint)) > 0: |
2747 |
if (newlp-nc_len(myprint)) > 0: |
| 2727 |
myprint=myprint+(" "*(newlp-nc_len(myprint))) |
2748 |
myprint=myprint+(" "*(newlp-nc_len(myprint))) |
| 2728 |
myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] " |
2749 |
myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] " |
|
Lines 2731-2751
Link Here
|
| 2731 |
myprint=myprint+myoldbest |
2752 |
myprint=myprint+myoldbest |
| 2732 |
myprint=myprint+darkgreen("to "+x[1])+" "+verboseadd |
2753 |
myprint=myprint+darkgreen("to "+x[1])+" "+verboseadd |
| 2733 |
else: |
2754 |
else: |
| 2734 |
if x[-1] == "nomerge" or not ordered: |
2755 |
if not pkg_merge: |
| 2735 |
myprint = darkblue("[nomerge ] ") |
2756 |
myprint = "[%s ] " % pkgprint("nomerge") |
| 2736 |
else: |
2757 |
else: |
| 2737 |
myprint = "[" + pkg_type + " " + addl + "] " |
2758 |
myprint = "[" + pkg_type + " " + addl + "] " |
| 2738 |
myprint += indent + darkgreen(pkg_key) + " " + \ |
2759 |
myprint += indent + pkgprint(pkg_key) + " " + \ |
| 2739 |
myoldbest + darkgreen("to " + myroot) + " " + \ |
2760 |
myoldbest + darkgreen("to " + myroot) + " " + \ |
| 2740 |
verboseadd |
2761 |
verboseadd |
| 2741 |
else: |
2762 |
else: |
| 2742 |
if "--columns" in self.myopts: |
2763 |
if "--columns" in self.myopts: |
| 2743 |
if "--quiet" in self.myopts: |
2764 |
if "--quiet" in self.myopts: |
| 2744 |
myprint=addl+" "+indent+darkgreen(xs[0]) |
2765 |
myprint=addl+" "+indent+pkgprint(pkg_cp) |
| 2745 |
myprint=myprint+" "+green(xs[1]+xs[2])+" " |
2766 |
myprint=myprint+" "+green(xs[1]+xs[2])+" " |
| 2746 |
myprint=myprint+myoldbest |
2767 |
myprint=myprint+myoldbest |
| 2747 |
else: |
2768 |
else: |
| 2748 |
myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0]) |
2769 |
myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_cp) |
| 2749 |
if (newlp-nc_len(myprint)) > 0: |
2770 |
if (newlp-nc_len(myprint)) > 0: |
| 2750 |
myprint=myprint+(" "*(newlp-nc_len(myprint))) |
2771 |
myprint=myprint+(" "*(newlp-nc_len(myprint))) |
| 2751 |
myprint=myprint+green(" ["+xs[1]+xs[2]+"] ") |
2772 |
myprint=myprint+green(" ["+xs[1]+xs[2]+"] ") |
|
Lines 2753-2762
Link Here
|
| 2753 |
myprint=myprint+(" "*(oldlp-nc_len(myprint))) |
2774 |
myprint=myprint+(" "*(oldlp-nc_len(myprint))) |
| 2754 |
myprint=myprint+myoldbest+" "+verboseadd |
2775 |
myprint=myprint+myoldbest+" "+verboseadd |
| 2755 |
else: |
2776 |
else: |
| 2756 |
if x[-1] == "nomerge" or not ordered: |
2777 |
if not pkg_merge: |
| 2757 |
myprint=darkblue("[nomerge ] "+indent+x[2]+" "+myoldbest+" ")+verboseadd |
2778 |
myprint="["+pkgprint("nomerge")+" ] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd |
| 2758 |
else: |
2779 |
else: |
| 2759 |
myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(x[2])+" "+myoldbest+" "+verboseadd |
2780 |
myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd |
| 2760 |
p.append(myprint) |
2781 |
p.append(myprint) |
| 2761 |
|
2782 |
|
| 2762 |
mysplit = portage.pkgsplit(x[2]) |
2783 |
mysplit = portage.pkgsplit(x[2]) |
