diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-03-04 06:54:52 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-03-04 06:54:52 +0000 |
commit | 67424c79c1a824554cecd5172f9bcaaa436921ad (patch) | |
tree | 239c7cd372b5b66fac865330e9cd2c7587794522 | |
parent | f1da06467b7cc48f67ad7e77cae92e448e8f509e (diff) | |
download | portage-67424c79c1a824554cecd5172f9bcaaa436921ad.tar.gz portage-67424c79c1a824554cecd5172f9bcaaa436921ad.tar.bz2 portage-67424c79c1a824554cecd5172f9bcaaa436921ad.zip |
Remove the 'didupdate' variable from global_updates() because it is no longer used.
svn path=/main/trunk/; revision=2811
-rw-r--r-- | pym/portage.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pym/portage.py b/pym/portage.py index 8a33d155f..8dd2866b0 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6866,7 +6866,6 @@ def global_updates(): else: update_data = grab_updates(updpath, mtimedb["updates"]) if len(update_data) > 0: - didupdate = 1 do_upgrade_packagesmessage = 0 myupd = [] timestamps = {} @@ -6920,14 +6919,13 @@ def global_updates(): print print - if didupdate: - #make sure our internal databases are consistent; recreate our virts and vartree - do_vartree(settings) - if do_upgrade_packagesmessage and \ - listdir(os.path.join(settings["PKGDIR"], "All"), EmptyOnError=1): - writemsg(" ** Skipping packages. Run 'fixpackages' or set it in FEATURES to fix the") - writemsg("\n tbz2's in the packages directory. "+bold("Note: This can take a very long time.")) - writemsg("\n") + #make sure our internal databases are consistent; recreate our virts and vartree + do_vartree(settings) + if do_upgrade_packagesmessage and \ + listdir(os.path.join(settings["PKGDIR"], "All"), EmptyOnError=1): + writemsg(" ** Skipping packages. Run 'fixpackages' or set it in FEATURES to fix the") + writemsg("\n tbz2's in the packages directory. "+bold("Note: This can take a very long time.")) + writemsg("\n") if (secpass==2) and (not os.environ.has_key("SANDBOX_ACTIVE")): if settings["PORTAGE_CALLER"] in ["emerge","fixpackages"]: |