|
Lines 8157-8162
Link Here
|
| 8157 |
if ordered: |
8157 |
if ordered: |
| 8158 |
if pkg_merge: |
8158 |
if pkg_merge: |
| 8159 |
counters.reinst += 1 |
8159 |
counters.reinst += 1 |
|
|
8160 |
if pkg_type == "binary": |
| 8161 |
counters.binary += 1 |
| 8160 |
elif pkg_status == "uninstall": |
8162 |
elif pkg_status == "uninstall": |
| 8161 |
counters.uninst += 1 |
8163 |
counters.uninst += 1 |
| 8162 |
# filter out old-style virtual matches |
8164 |
# filter out old-style virtual matches |
|
Lines 8179-8195
Link Here
|
| 8179 |
addl += turquoise("U")+blue("D") |
8181 |
addl += turquoise("U")+blue("D") |
| 8180 |
if ordered: |
8182 |
if ordered: |
| 8181 |
counters.downgrades += 1 |
8183 |
counters.downgrades += 1 |
|
|
8184 |
if pkg_type == "binary": |
| 8185 |
counters.binary += 1 |
| 8182 |
else: |
8186 |
else: |
| 8183 |
# Update in slot |
8187 |
# Update in slot |
| 8184 |
addl += turquoise("U") + " " |
8188 |
addl += turquoise("U") + " " |
| 8185 |
if ordered: |
8189 |
if ordered: |
| 8186 |
counters.upgrades += 1 |
8190 |
counters.upgrades += 1 |
|
|
8191 |
if pkg_type == "binary": |
| 8192 |
counters.binary += 1 |
| 8187 |
else: |
8193 |
else: |
| 8188 |
# New slot, mark it new. |
8194 |
# New slot, mark it new. |
| 8189 |
addl = " " + green("NS") + fetch + " " |
8195 |
addl = " " + green("NS") + fetch + " " |
| 8190 |
myoldbest = vardb.match(portage.cpv_getkey(pkg_key)) |
8196 |
myoldbest = vardb.match(portage.cpv_getkey(pkg_key)) |
| 8191 |
if ordered: |
8197 |
if ordered: |
| 8192 |
counters.newslot += 1 |
8198 |
counters.newslot += 1 |
|
|
8199 |
if pkg_type == "binary": |
| 8200 |
counters.binary += 1 |
| 8193 |
|
8201 |
|
| 8194 |
if "--changelog" in self.myopts: |
8202 |
if "--changelog" in self.myopts: |
| 8195 |
inst_matches = vardb.match(pkg.slot_atom) |
8203 |
inst_matches = vardb.match(pkg.slot_atom) |
|
Lines 8201-8206
Link Here
|
| 8201 |
addl = " " + green("N") + " " + fetch + " " |
8209 |
addl = " " + green("N") + " " + fetch + " " |
| 8202 |
if ordered: |
8210 |
if ordered: |
| 8203 |
counters.new += 1 |
8211 |
counters.new += 1 |
|
|
8212 |
if pkg_type == "binary": |
| 8213 |
counters.binary += 1 |
| 8204 |
|
8214 |
|
| 8205 |
verboseadd = "" |
8215 |
verboseadd = "" |
| 8206 |
repoadd = None |
8216 |
repoadd = None |
|
Lines 9251-9256
Link Here
|
| 9251 |
self.restrict_fetch = 0 |
9261 |
self.restrict_fetch = 0 |
| 9252 |
self.restrict_fetch_satisfied = 0 |
9262 |
self.restrict_fetch_satisfied = 0 |
| 9253 |
self.interactive = 0 |
9263 |
self.interactive = 0 |
|
|
9264 |
self.binary = 0 |
| 9254 |
|
9265 |
|
| 9255 |
def __str__(self): |
9266 |
def __str__(self): |
| 9256 |
total_installs = self.upgrades + self.downgrades + self.newslot + self.new + self.reinst |
9267 |
total_installs = self.upgrades + self.downgrades + self.newslot + self.new + self.reinst |
|
Lines 9279-9284
Link Here
|
| 9279 |
details.append("%s reinstall" % self.reinst) |
9290 |
details.append("%s reinstall" % self.reinst) |
| 9280 |
if self.reinst > 1: |
9291 |
if self.reinst > 1: |
| 9281 |
details[-1] += "s" |
9292 |
details[-1] += "s" |
|
|
9293 |
if self.binary > 0: |
| 9294 |
details.append("%s binary" % self.binary) |
| 9295 |
if self.binary > 1: |
| 9296 |
details[-1] = details[-1][:-1] + "ies" |
| 9282 |
if self.uninst > 0: |
9297 |
if self.uninst > 0: |
| 9283 |
details.append("%s uninstall" % self.uninst) |
9298 |
details.append("%s uninstall" % self.uninst) |
| 9284 |
if self.uninst > 1: |
9299 |
if self.uninst > 1: |
