| 1 |
Author: grobian |
| 2 |
Date: 2008-10-30 21:16:03 +0000 (Thu, 30 Oct 2008) |
| 3 |
New Revision: 11755 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/repoman |
| 7 |
Log: |
| 8 |
recheck what changed in the repository also when nothing was added, because manifest regeneration might change the Manifest, this fixes bug #229033 |
| 9 |
|
| 10 |
Modified: main/branches/prefix/bin/repoman |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/bin/repoman 2008-10-30 21:13:23 UTC (rev 11754) |
| 13 |
+++ main/branches/prefix/bin/repoman 2008-10-30 21:16:03 UTC (rev 11755) |
| 14 |
@@ -1696,10 +1696,9 @@ |
| 15 |
sys.exit(1) |
| 16 |
|
| 17 |
if vcs == "cvs": |
| 18 |
- if myautoadd: |
| 19 |
- mycvstree = cvstree.getentries("./", recursive=1) |
| 20 |
- mychanged = cvstree.findchanged(mycvstree, recursive=1, basedir="./") |
| 21 |
- mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./") |
| 22 |
+ mycvstree = cvstree.getentries("./", recursive=1) |
| 23 |
+ mychanged = cvstree.findchanged(mycvstree, recursive=1, basedir="./") |
| 24 |
+ mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./") |
| 25 |
myremoved=portage.cvstree.findremoved(mycvstree,recursive=1,basedir="./") |
| 26 |
bin_blob_pattern = re.compile("^-kb$") |
| 27 |
no_expansion = set(portage.cvstree.findoption(mycvstree, bin_blob_pattern, |
| 28 |
@@ -1707,10 +1706,9 @@ |
| 29 |
|
| 30 |
|
| 31 |
if vcs == "svn": |
| 32 |
- if myautoadd: |
| 33 |
- svnstatus = os.popen("svn status").readlines() |
| 34 |
- mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ] |
| 35 |
- mynew = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ] |
| 36 |
+ svnstatus = os.popen("svn status").readlines() |
| 37 |
+ mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ] |
| 38 |
+ mynew = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ] |
| 39 |
myremoved = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("D") ] |
| 40 |
# in contrast to CVS, SVN expands nothing by default. |
| 41 |
# bin_blobs historically |
Archives