cromer/pamac-classic
2
0
Fork 3
Code Issues 2 Pull Requests 1 Releases 13 Wiki Activity

some adjustements

Browse Source
This commit is contained in:
guinux 2013-01-23 16:51:27 +01:00
parent 5974e58935
commit be6686229c
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pamac/transaction.py
View File

@ -121,12 +121,28 @@ def check_conflicts():
if name == target.name: if name == target.name:
if not name in to_remove: if not name in to_remove:
to_remove.append(installed_pkg.name) to_remove.append(installed_pkg.name)
for repo in handle.get_syncdbs():
for pkg in repo.pkgcache:
if pkg.replaces:
for name in pkg.replaces:
for installed_pkg in handle.get_localdb().pkgcache:
if name == installed_pkg.name:
if not name in to_remove:
to_remove.append(installed_pkg.name)
if warning:
warning = warning+'\n'
warning = warning+installed_pkg.name+' will be replaced by '+pkg.name
print(name)
if not pkg.name in to_add:
to_add.append(pkg.name)
if warning: if warning:
WarningDialog.format_secondary_text(warning) WarningDialog.format_secondary_text(warning)
response = WarningDialog.run() response = WarningDialog.run()
if response: if response:
WarningDialog.hide() WarningDialog.hide()
def get_to_remove(): def get_to_remove():
global to_remove global to_remove
to_remove = To_Remove() to_remove = To_Remove()

2
pamac/updater.py
View File

@ -187,7 +187,7 @@ class Handler:
have_updates() have_updates()
def main(): def main():
#transaction.do_refresh() transaction.do_refresh()
have_updates() have_updates()
interface.connect_signals(Handler()) interface.connect_signals(Handler())
UpdateWindow.show_all() UpdateWindow.show_all()