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