|
Lines 1790-1795
Link Here
|
| 1790 |
else: |
1790 |
else: |
| 1791 |
raise portage_exception.PortageException("!!! gpg exited with '" + str(rValue) + "' status") |
1791 |
raise portage_exception.PortageException("!!! gpg exited with '" + str(rValue) + "' status") |
| 1792 |
|
1792 |
|
|
|
1793 |
# When files are removed and re-added, the cvs server will put /Attic/ |
| 1794 |
# inside the $Header path. This code detects the problem and corrects it |
| 1795 |
# so that the Manifest will generate correctly. See bug #169500. |
| 1796 |
from portage_util import write_atomic |
| 1797 |
cvs_header = re.compile(r'^#\s*\$Header.*\$$') |
| 1798 |
for x in myheaders: |
| 1799 |
f = open(x) |
| 1800 |
mylines = f.readlines() |
| 1801 |
f.close() |
| 1802 |
modified = False |
| 1803 |
for i, line in enumerate(mylines): |
| 1804 |
if cvs_header.match(line) and "/Attic/" in line: |
| 1805 |
mylines[i] = line.replace("/Attic/", "/") |
| 1806 |
modified = True |
| 1807 |
if modified: |
| 1808 |
write_atomic(x, "".join(mylines)) |
| 1809 |
|
| 1793 |
manifest_commit_required = True |
1810 |
manifest_commit_required = True |
| 1794 |
if myheaders or myupdates or myremoved or mynew: |
1811 |
if myheaders or myupdates or myremoved or mynew: |
| 1795 |
myfiles=myheaders+myupdates+myremoved+mynew |
1812 |
myfiles=myheaders+myupdates+myremoved+mynew |
