From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 9 Mar 2011 19:46:41 +0000 (+0100)
Subject: Add code to remove a package.
X-Git-Tag: 0.9.3~78^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b64963676ed69d346241586f1e17ea7d6eda97e9;p=pakfire.git

Add code to remove a package.
---

diff --git a/pakfire/transaction.py b/pakfire/transaction.py
index 1dcf48e3f..3c7006b55 100644
--- a/pakfire/transaction.py
+++ b/pakfire/transaction.py
@@ -101,13 +101,11 @@ class ActionCleanup(Action):
 
 		return files
 
-	def run(self):
-		files = self.gen_files()
-
+	def remove_files(self, message, files):
 		if not files:
 			return
 
-		pb = self.make_progress(_("Cleanup: %s") % pkg.name, len(files))
+		pb = self.make_progress(message, len(files))
 		i = 0
 
 		for f in self.files:
@@ -132,6 +130,14 @@ class ActionCleanup(Action):
 		if pb:
 			pb.finish()
 
+	def run(self):
+		files = self.gen_files()
+
+		if not files:
+			return
+
+		self.remove_files(_("Cleanup: %s") % pkg.name, files)
+
 
 class ActionScript(Action):
 	def run(self):
@@ -158,8 +164,14 @@ class ActionInstall(Action):
 	pass
 
 
-class ActionRemove(Action):
-	pass
+class ActionRemove(ActionCleanup):
+	def run(self):
+		files = self.pkg.filelist
+
+		if not files:
+			return
+
+		self.remove_files(_("Remove: %s") % pkg.name, files)
 
 
 class TransactionSet(object):
@@ -283,8 +295,11 @@ class Transaction(object):
 			self.add_action(action)
 
 	def _remove_pkg(self, pkg):
-		# XXX TBD
-		pass
+		# XXX add scripts
+		action_remove = ActionRemove(self.pakfire, pkg)
+
+		for action in (action_remove):
+			self.add_action(action)
 
 	def populate(self):
 		# Determine which packages we have to add
diff --git a/po/pakfire.pot b/po/pakfire.pot
index 363a0250f..3fabc6460 100644
--- a/po/pakfire.pot
+++ b/po/pakfire.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-09 20:31+0100\n"
+"POT-Creation-Date: 2011-03-09 20:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -293,7 +293,12 @@ msgstr ""
 msgid "%s: package database"
 msgstr ""
 
-#: ../pakfire/transaction.py:110
+#: ../pakfire/transaction.py:139
 #, python-format
 msgid "Cleanup: %s"
 msgstr ""
+
+#: ../pakfire/transaction.py:174
+#, python-format
+msgid "Remove: %s"
+msgstr ""