|
Lines 1795-1802
Link Here
|
| 1795 |
if myout[0] == 0: |
1795 |
if myout[0] == 0: |
| 1796 |
myheaders.append(myfile) |
1796 |
myheaders.append(myfile) |
| 1797 |
|
1797 |
|
| 1798 |
print "*",green(str(len(myupdates))),"files being committed...",green(str(len(myheaders))),"have headers that will change." |
1798 |
print "* %s files being committed..." % green(str(len(myupdates))), |
| 1799 |
print "*","Files with headers will cause the manifests to be made and recommited." |
1799 |
if vcs == 'git': |
|
|
1800 |
# With git, there's never any keyword expansion, so there's |
| 1801 |
# no need to regenerate manifests and all files will be |
| 1802 |
# committed in one big commit at the end. |
| 1803 |
print |
| 1804 |
else: |
| 1805 |
print "%s have headers that will change." % green(str(len(myheaders))) |
| 1806 |
print "* Files with headers will cause the " + \ |
| 1807 |
"manifests to be made and recommited." |
| 1800 |
logging.info("myupdates:", str(myupdates)) |
1808 |
logging.info("myupdates:", str(myupdates)) |
| 1801 |
logging.info("myheaders:", str(myheaders)) |
1809 |
logging.info("myheaders:", str(myheaders)) |
| 1802 |
|
1810 |
|
|
Lines 1844-1850
Link Here
|
| 1844 |
commitmessage += ", RepoMan options: --force" |
1852 |
commitmessage += ", RepoMan options: --force" |
| 1845 |
commitmessage += ")" |
1853 |
commitmessage += ")" |
| 1846 |
|
1854 |
|
| 1847 |
if myupdates or myremoved: |
1855 |
if vcs != 'git' and (myupdates or myremoved): |
| 1848 |
myfiles = myupdates + myremoved |
1856 |
myfiles = myupdates + myremoved |
| 1849 |
if not myheaders and "sign" not in repoman_settings.features: |
1857 |
if not myheaders and "sign" not in repoman_settings.features: |
| 1850 |
myfiles += mymanifests |
1858 |
myfiles += mymanifests |
|
Lines 1937-1943
Link Here
|
| 1937 |
write_atomic(x, "".join(mylines)) |
1945 |
write_atomic(x, "".join(mylines)) |
| 1938 |
|
1946 |
|
| 1939 |
manifest_commit_required = True |
1947 |
manifest_commit_required = True |
| 1940 |
if myupdates or myremoved or mynew: |
1948 |
if vcs != 'git' and (myupdates or myremoved or mynew): |
| 1941 |
myfiles=myupdates+myremoved+mynew |
1949 |
myfiles=myupdates+myremoved+mynew |
| 1942 |
for x in range(len(myfiles)-1, -1, -1): |
1950 |
for x in range(len(myfiles)-1, -1, -1): |
| 1943 |
if myfiles[x].count("/") < 4-repolevel: |
1951 |
if myfiles[x].count("/") < 4-repolevel: |
|
Lines 2059-2066
Link Here
|
| 2059 |
portage.writemsg("!!! Disabled FEATURES='sign'\n") |
2067 |
portage.writemsg("!!! Disabled FEATURES='sign'\n") |
| 2060 |
signed = False |
2068 |
signed = False |
| 2061 |
|
2069 |
|
| 2062 |
if manifest_commit_required or signed: |
2070 |
if vcs == 'git' or manifest_commit_required or signed: |
| 2063 |
|
2071 |
|
|
|
2072 |
myfiles = mymanifests[:] |
| 2073 |
if vcs == 'git': |
| 2074 |
myfiles += myupdates |
| 2075 |
myfiles += myremoved |
| 2076 |
myfiles.sort() |
| 2077 |
|
| 2064 |
fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") |
2078 |
fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") |
| 2065 |
mymsg = os.fdopen(fd, "w") |
2079 |
mymsg = os.fdopen(fd, "w") |
| 2066 |
mymsg.write(commitmessage) |
2080 |
mymsg.write(commitmessage) |
|
Lines 2075-2081
Link Here
|
| 2075 |
commit_cmd.append("commit") |
2089 |
commit_cmd.append("commit") |
| 2076 |
commit_cmd.extend(vcs_local_opts) |
2090 |
commit_cmd.extend(vcs_local_opts) |
| 2077 |
commit_cmd.extend(["-F", commitmessagefile]) |
2091 |
commit_cmd.extend(["-F", commitmessagefile]) |
| 2078 |
commit_cmd.extend(f.lstrip("./") for f in mymanifests) |
2092 |
commit_cmd.extend(f.lstrip("./") for f in myfiles) |
| 2079 |
|
2093 |
|
| 2080 |
try: |
2094 |
try: |
| 2081 |
if options.pretend: |
2095 |
if options.pretend: |
