sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix diff generation and generateDependencyTree() inside deptest function

Browse Source 
git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@579 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
(no author)
2007-10-25 09:02:52 +00:00
parent 124e1b06de
commit 73088e54c1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/confTools.py
View File

@@ -150,7 +150,7 @@ def update():
continue
# end check
diff = showdiff(scandata[cmd]['source'],scandata[cmd]['destination'])
diff = showdiff(scandata[cmd]['destination'],scandata[cmd]['source'])
if (not diff):
print_info(darkred("Automerging file ")+darkgreen(scandata[cmd]['source']))
os.rename(scandata[cmd]['source'],scandata[cmd]['destination'])

2
client/equoTools.py
View File

@@ -2486,7 +2486,7 @@ def dependenciesTest(quiet = False, ask = False, pretend = False):
atom = clientDbconn.retrieveAtom(xidpackage)
if (not quiet):
print_info(darkred(" @@ ")+bold("(")+blue(str(count))+"/"+red(length)+bold(")")+darkgreen(" Checking ")+bold(atom), back = True)
deptree, status = generateDependencyTree([xidpackage,0])
deptree, status = generateDependencyTree((xidpackage,0))
if (status == 0):
# skip conflicts