From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Sep 2011 22:54:54 +0000 (+0200)
Subject: Cleanup some class names.
X-Git-Tag: 0.9.9~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff9299d0681edce58d96a665991918d49b3ec480;p=pakfire.git

Cleanup some class names.
---

diff --git a/pakfire/base.py b/pakfire/base.py
index 9ba126bc7..50bd5c4d0 100644
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@ -415,7 +415,7 @@ class Pakfire(object):
 		if not resultdirs:
 			resultdirs = []
 
-		b = builder.Builder(pkg, **kwargs)
+		b = builder.BuildEnviron(pkg, **kwargs)
 		p = b.pakfire
 
 		# Always include local repository.
@@ -443,9 +443,7 @@ class Pakfire(object):
 			b.destroy()
 
 	def _build(self, pkg, resultdir, nodeps=False, **kwargs):
-		print kwargs
-
-		b = builder.Builder2(self, pkg, resultdir, **kwargs)
+		b = builder.Builder(self, pkg, resultdir, **kwargs)
 
 		try:
 			b.build()
@@ -456,7 +454,7 @@ class Pakfire(object):
 
 	@staticmethod
 	def shell(pkg, **kwargs):
-		b = builder.Builder(pkg, **kwargs)
+		b = builder.BuildEnviron(pkg, **kwargs)
 
 		try:
 			b.prepare()
diff --git a/pakfire/builder.py b/pakfire/builder.py
index 6ea4997da..15786d214 100644
--- a/pakfire/builder.py
+++ b/pakfire/builder.py
@@ -590,10 +590,7 @@ class BuildEnviron(object):
 		finally:
 			self._umountall()
 
-# XXX backwards compatibilty
-Builder = BuildEnviron
-
-class Builder2(object):
+class Builder(object):
 	def __init__(self, pakfire, filename, resultdir, **kwargs):
 		self.pakfire = pakfire
 
diff --git a/po/pakfire.pot b/po/pakfire.pot
index 1184c2761..8a14348f2 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-09-24 00:42+0200\n"
+"POT-Creation-Date: 2011-09-24 00:53+0200\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"
@@ -69,11 +69,11 @@ msgstr ""
 msgid "There are no packages to install."
 msgstr ""
 
-#: ../pakfire/base.py:453
+#: ../pakfire/base.py:451
 msgid "Build command has failed."
 msgstr ""
 
-#: ../pakfire/base.py:537
+#: ../pakfire/base.py:535
 msgid "Everything is fine."
 msgstr ""
 
@@ -92,12 +92,12 @@ msgstr ""
 
 #. Package the result.
 #. Make all these little package from the build environment.
-#: ../pakfire/builder.py:702
+#: ../pakfire/builder.py:699
 msgid "Creating packages:"
 msgstr ""
 
 #. Execute the buildscript of this stage.
-#: ../pakfire/builder.py:714
+#: ../pakfire/builder.py:711
 #, python-format
 msgid "Running stage %s:"
 msgstr ""