diff options
| -rw-r--r-- | project.py | 25 |
1 files changed, 0 insertions, 25 deletions
| @@ -529,7 +529,6 @@ class Project(object): | |||
| 529 | return False | 529 | return False |
| 530 | 530 | ||
| 531 | if self.worktree: | 531 | if self.worktree: |
| 532 | self._RepairAndroidImportErrors() | ||
| 533 | self._InitMRef() | 532 | self._InitMRef() |
| 534 | else: | 533 | else: |
| 535 | self._InitMirrorHead() | 534 | self._InitMirrorHead() |
| @@ -546,30 +545,6 @@ class Project(object): | |||
| 546 | for file in self.copyfiles: | 545 | for file in self.copyfiles: |
| 547 | file._Copy() | 546 | file._Copy() |
| 548 | 547 | ||
| 549 | def _RepairAndroidImportErrors(self): | ||
| 550 | if self.name in ['platform/external/iptables', | ||
| 551 | 'platform/external/libpcap', | ||
| 552 | 'platform/external/tcpdump', | ||
| 553 | 'platform/external/webkit', | ||
| 554 | 'platform/system/wlan/ti']: | ||
| 555 | # I hate myself for doing this... | ||
| 556 | # | ||
| 557 | # In the initial Android 1.0 release these projects were | ||
| 558 | # shipped, some users got them, and then the history had | ||
| 559 | # to be rewritten to correct problems with their imports. | ||
| 560 | # The 'android-1.0' tag may still be pointing at the old | ||
| 561 | # history, so we need to drop the tag and fetch it again. | ||
| 562 | # | ||
| 563 | try: | ||
| 564 | remote = self.GetRemote(self.remote.name) | ||
| 565 | relname = remote.ToLocal(R_HEADS + 'release-1.0') | ||
| 566 | tagname = R_TAGS + 'android-1.0' | ||
| 567 | if self._revlist(not_rev(relname), tagname): | ||
| 568 | cmd = ['fetch', remote.name, '+%s:%s' % (tagname, tagname)] | ||
| 569 | GitCommand(self, cmd, bare = True).Wait() | ||
| 570 | except GitError: | ||
| 571 | pass | ||
| 572 | |||
| 573 | def Sync_LocalHalf(self): | 548 | def Sync_LocalHalf(self): |
| 574 | """Perform only the local IO portion of the sync process. | 549 | """Perform only the local IO portion of the sync process. |
| 575 | Network access is not required. | 550 | Network access is not required. |
