commit 0c5e12193ed131da80fda46b4e11236084b0fa23
Author: Yi Yang <[email protected]>
Date: Thu Nov 11 16:38:20 2010 +0800
use a general name for package manager
diff --git a/mic/appcreate/nand.py b/mic/appcreate/nand.py
index 4fad2b7..9d56835 100644
--- a/mic/appcreate/nand.py
+++ b/mic/appcreate/nand.py
@@ -282,13 +282,13 @@ class NandImageCreator(ApplianceImageCreator):
yum_conf = self._mktemp(prefix = "yum.conf-")
self._required_pkgs = self._get_required_packages()
- ayum = self.get_pkg_manager()
- ayum.setup(yum_conf, self._instroot)
+ pkg_manager = self.get_pkg_manager()
+ pkg_manager.setup(yum_conf, self._instroot)
for repo in kickstart.get_repos(self.ks, repo_urls):
(name, baseurl, mirrorlist, inc, exc, proxy, proxy_username,
proxy_password, debuginfo, source, gpgkey, disable) = repo
- yr = ayum.addRepository(name, baseurl, mirrorlist, proxy,
proxy_username, proxy_password)
+ yr = pkg_manager.addRepository(name, baseurl, mirrorlist, proxy,
proxy_username, proxy_password)
if inc:
yr.includepkgs = inc
if exc:
@@ -299,15 +299,15 @@ class NandImageCreator(ApplianceImageCreator):
try:
try:
- ayum.selectPackage('bootstub')
+ pkg_manager.selectPackage('bootstub')
#if not (self.__initrd_path or self.__initrd_url):
- # ayum.selectPackage('initrd*')
+ # pkg_manager.selectPackage('initrd*')
if self.__kernel_rpm_path or self.__kernel_rpm_url:
# install local kernel rpm
for rpm_path in self._get_local_packages():
- ayum.installLocal(rpm_path)
+ pkg_manager.installLocal(rpm_path)
elif self.__kernel_path or self.__kernel_url:
if not (self.__initrd_path or self.__initrd_url):
raise CreatorError("NO initrd.img specified")
@@ -318,7 +318,7 @@ class NandImageCreator(ApplianceImageCreator):
continue
kernel_found = True
- e = ayum.selectPackage(pkg)
+ e = pkg_manager.selectPackage(pkg)
if e:
raise CreatorError("Failed to find package '%s' :
%s" %
(pkg, e))
@@ -326,14 +326,14 @@ class NandImageCreator(ApplianceImageCreator):
raise CreatorError("NO kernel packages specified")
for pkg in self._excluded_pkgs:
- ayum.deselectPackage(pkg)
+ pkg_manager.deselectPackage(pkg)
- ayum.runInstall()
+ pkg_manager.runInstall()
except CreatorError, e:
raise CreatorError("%s" % (e,))
finally:
- ayum.closeRpmDB()
- ayum.close()
+ pkg_manager.closeRpmDB()
+ pkg_manager.close()
os.unlink(yum_conf)
def configure(self, repodata = None):
diff --git a/mic/imgconvert/convertor.py b/mic/imgconvert/convertor.py
index d483e2a..012111e 100644
--- a/mic/imgconvert/convertor.py
+++ b/mic/imgconvert/convertor.py
@@ -82,7 +82,7 @@ class ImageConvertor:
if self._srcloop:
self._srcloop.cleanup()
- def _select_kernel_pkg(self, ayum):
+ def _select_kernel_pkg(self, pkg_manager):
kernel_pkgs = []
for pkg in imgcreate.kickstart.get_packages(self.ks):
if pkg.startswith('kernel'):
@@ -91,7 +91,7 @@ class ImageConvertor:
kernel_pkgs.append('kernel')
for pkg in kernel_pkgs:
- e = ayum.selectPackage(pkg)
+ e = pkg_manager.selectPackage(pkg)
if e:
if imgcreate.kickstart.ignore_missing(self.ks):
skipped_pkgs.append(pkg)
@@ -131,13 +131,13 @@ class ImageConvertor:
args = [ imgcreate.fs.find_binary_path("rpm"), "--root=" + instroot,
"-e", kernel ]
subprocess.call(args)
- ayum = self.get_pkg_manager()
- ayum.setup(self._yum_conf, self._instroot)
+ pkg_manager = self.get_pkg_manager()
+ pkg_manager.setup(self._yum_conf, self._instroot)
for repo in imgcreate.kickstart.get_repos(self.ks, repo_urls):
(name, baseurl, mirrorlist, inc, exc, proxy, proxy_username,
proxy_password, debuginfo, source, gpgkey) = repo
- yr = ayum.addRepository(name, baseurl, mirrorlist, proxy,
proxy_username, proxy_password)
+ yr = pkg_manager.addRepository(name, baseurl, mirrorlist, proxy,
proxy_username, proxy_password)
if inc:
yr.includepkgs = inc
if exc:
@@ -148,13 +148,13 @@ class ImageConvertor:
try:
try:
- self._select_kernel_pkg(ayum)
- ayum.runInstall()
+ self._select_kernel_pkg(pkg_manager)
+ pkg_manager.runInstall()
except imgcreate.CreatorError, e:
raise imgcreate.CreatorError("%s" % (e,))
finally:
- ayum.closeRpmDB()
- ayum.close()
+ pkg_manager.closeRpmDB()
+ pkg_manager.close()
os.unlink(self._yum_conf)
def _copyfs(self, src, dst):
diff --git a/mic/imgcreate/creator.py b/mic/imgcreate/creator.py
index c12f86f..ee78b92 100644
--- a/mic/imgcreate/creator.py
+++ b/mic/imgcreate/creator.py
@@ -714,10 +714,10 @@ class ImageCreator(object):
return None
- def __select_packages(self, ayum):
+ def __select_packages(self, pkg_manager):
skipped_pkgs = []
for pkg in self._required_pkgs:
- e = ayum.selectPackage(pkg)
+ e = pkg_manager.selectPackage(pkg)
if e:
if kickstart.ignore_missing(self.ks):
skipped_pkgs.append(pkg)
@@ -730,10 +730,10 @@ class ImageCreator(object):
for pkg in skipped_pkgs:
logging.warn("Skipping missing package '%s'" % (pkg,))
- def __select_groups(self, ayum):
+ def __select_groups(self, pkg_manager):
skipped_groups = []
for group in self._required_groups:
- e = ayum.selectGroup(group.name, group.include)
+ e = pkg_manager.selectGroup(group.name, group.include)
if e:
if kickstart.ignore_missing(self.ks):
skipped_groups.append(group)
@@ -744,13 +744,13 @@ class ImageCreator(object):
for group in skipped_groups:
logging.warn("Skipping missing group '%s'" % (group.name,))
- def __deselect_packages(self, ayum):
+ def __deselect_packages(self, pkg_manager):
for pkg in self._excluded_pkgs:
- ayum.deselectPackage(pkg)
+ pkg_manager.deselectPackage(pkg)
- def __localinst_packages(self, ayum):
+ def __localinst_packages(self, pkg_manager):
for rpm_path in self._get_local_packages():
- ayum.installLocal(rpm_path)
+ pkg_manager.installLocal(rpm_path)
def install(self, repo_urls = {}):
"""Install packages into the install root.
@@ -788,13 +788,13 @@ class ImageCreator(object):
if self._recording_pkgs in ('name', 'contents'):
keep_record = self._recording_pkgs
- ayum = self.get_pkg_manager(keep_record, target_arch =
self.target_arch)
- ayum.setup(yum_conf, self._instroot)
+ pkg_manager = self.get_pkg_manager(keep_record, target_arch =
self.target_arch)
+ pkg_manager.setup(yum_conf, self._instroot)
for repo in kickstart.get_repos(self.ks, repo_urls):
(name, baseurl, mirrorlist, inc, exc, proxy, proxy_username,
proxy_password, debuginfo, source, gpgkey, disable) = repo
- yr = ayum.addRepository(name, baseurl, mirrorlist, proxy,
proxy_username, proxy_password)
+ yr = pkg_manager.addRepository(name, baseurl, mirrorlist, proxy,
proxy_username, proxy_password)
if inc:
yr.includepkgs = inc
if exc:
@@ -808,26 +808,26 @@ class ImageCreator(object):
try:
try:
- self.__select_packages(ayum)
- self.__select_groups(ayum)
- self.__deselect_packages(ayum)
- self.__localinst_packages(ayum)
+ self.__select_packages(pkg_manager)
+ self.__select_groups(pkg_manager)
+ self.__deselect_packages(pkg_manager)
+ self.__localinst_packages(pkg_manager)
BOOT_SAFEGUARD = 256L * 1024 * 1024 # 256M
checksize = self._root_fs_avail
if checksize:
checksize -= BOOT_SAFEGUARD
if self.target_arch:
- ayum._add_prob_flags(rpm.RPMPROB_FILTER_IGNOREARCH)
- ayum.runInstall(checksize)
+ pkg_manager._add_prob_flags(rpm.RPMPROB_FILTER_IGNOREARCH)
+ pkg_manager.runInstall(checksize)
except CreatorError, e:
raise CreatorError("%s" % (e,))
finally:
if keep_record:
- self._pkgs_content = ayum.getAllContent()
+ self._pkgs_content = pkg_manager.getAllContent()
- ayum.closeRpmDB()
- ayum.close()
+ pkg_manager.closeRpmDB()
+ pkg_manager.close()
os.unlink(yum_conf)
# do some clean up to avoid lvm info leakage. this sucks.
_______________________________________________
MeeGo-dev mailing list
[email protected]
http://lists.meego.com/listinfo/meego-dev
