@@ -1146,6 +1146,7 @@ def unpack_url(self, link, location, only_download=False):
1146
1146
1147
1147
def install (self , install_options , global_options = ()):
1148
1148
"""Install everything in this set (after having downloaded and unpacked the packages)"""
1149
+ successful = []
1149
1150
to_install = [r for r in self .requirements .values ()
1150
1151
if not r .satisfied_by ]
1151
1152
@@ -1157,6 +1158,9 @@ def install(self, install_options, global_options=()):
1157
1158
if requirement .conflicts_with :
1158
1159
logger .notify ('Found existing installation: %s'
1159
1160
% requirement .conflicts_with )
1161
+ if requirement .name == 'distribute' :
1162
+ logger .notify ('Cannot upgrade distribute. Skipping.' )
1163
+ continue
1160
1164
logger .indent += 2
1161
1165
try :
1162
1166
requirement .uninstall (auto_confirm = True )
@@ -1173,9 +1177,10 @@ def install(self, install_options, global_options=()):
1173
1177
if requirement .conflicts_with and requirement .install_succeeded :
1174
1178
requirement .commit_uninstall ()
1175
1179
requirement .remove_temporary_source ()
1180
+ successful .append (requirement )
1176
1181
finally :
1177
1182
logger .indent -= 2
1178
- self .successfully_installed = to_install
1183
+ self .successfully_installed = successful
1179
1184
1180
1185
def create_bundle (self , bundle_filename ):
1181
1186
## FIXME: can't decide which is better; zip is easier to read
0 commit comments