Attachment 261641 Details for Bug 350391 – updated patch

[patch] updated patch

diff (text/plain), 5.26 KB, created by Bill Nottingham on 2007-11-16 19:04:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2007-11-16 19:04:33 UTC

Size: 5.26 KB

patch

obsolete

>diff --git a/configs/development.mash b/configs/development.mash
>index 4f6de7c..4f98f7a 100644
>--- a/configs/development.mash
>+++ b/configs/development.mash
>@@ -2,6 +2,7 @@
> 
> [development]
> rpm_path = %(arch)s/os/Packages
>+repodata_path = %(arch)s/os/
> source_path = source/SRPMS
> debuginfo = True
> multilib = True
>diff --git a/mash/__init__.py b/mash/__init__.py
>index f6eb426..5223a53 100644
>--- a/mash/__init__.py
>+++ b/mash/__init__.py
>@@ -95,7 +95,7 @@ class Mash:
>             os.execv("/usr/bin/createrepo", createrepo_cmd)
> 
>     def doCompose(self):
>-        def _write_files(list, path, comps = False, cachedir = None):
>+        def _write_files(list, path, repo_path, comps = False, cachedir = None):
>             
>             print "Writing out files for %s..." % (path,)
>             os.makedirs(path)
>@@ -135,12 +135,7 @@ class Mash:
>                     except:
>                         shutil.copyfile(src, dst)
>                         
>-            # deep, abiding, HAAACK
>-            if os.path.basename(os.path.normpath(path)) == "Packages":
>-                rpath = os.path.dirname(os.path.normpath(path))
>-            else:
>-                rpath = path
>-            status = self._makeMetadata(rpath, cachedir, comps, repoview = False)
>+            status = self._makeMetadata(repo_path, cachedir, comps, repoview = False)
> 
>         def has_any(l1, l2):
>             if type(l1) not in (type(()), type([])):
>@@ -267,17 +262,20 @@ class Mash:
>         pids = []
>         for arch in self.config.arches:
>             path = os.path.join(outputdir, self.config.rpm_path % { 'arch':arch })
>-            pid = _write_files(packages[arch].packages(), path, cachedir = cachedir, comps = True)
>+            repo_path = os.path.join(outputdir, self.config.repodata_path % { 'arch':arch })
>+            print path
>+            print repo_path
>+            pid = _write_files(packages[arch].packages(), path, repo_path, cachedir = cachedir, comps = True)
>             pids.append(pid)
>             
>             if self.config.debuginfo:
>                 path = os.path.join(outputdir, self.config.debuginfo_path % { 'arch': arch })
>-                pid = _write_files(debug[arch].packages(), path, cachedir = cachedir)
>+                pid = _write_files(debug[arch].packages(), path, path, cachedir = cachedir)
>                 pids.append(pid)
>                 
>             
>         path = os.path.join(outputdir, self.config.source_path)
>-        pid = _write_files(source.packages(), path, cachedir = cachedir)
>+        pid = _write_files(source.packages(), path, path, cachedir = cachedir)
>         pids.append(pid)
>         
>         print "Waiting for createrepo to finish..."
>@@ -321,9 +319,8 @@ class Mash:
>         else:
>             print "Resolving multilib for arch %s using method %s" % (arch, self.config.multilib_method)
>         pkgdir = os.path.join(self.config.workdir, self.config.name, self.config.rpm_path % {'arch':arch})
>-        repodir = os.path.dirname(pkgdir)
>+        repodir = os.path.join(self.config.workdir, self.config.name, self.config.repodata_path % {'arch':arch})
>         tmproot = os.path.join(tmpdir, "%s-%s.tmp" % (self.config.name, arch))
>-        yumcachedir = os.path.join(tmproot, "yumcache")
>             
>         yumbase = yum.YumBase()
>         archlist = masharch.compat[arch]
>@@ -342,7 +339,7 @@ pkgpolicy=newest
> exactarch=1
> gpgcheck=0
> reposdir=/dev/null
>-cachedir=%s
>+cachedir=/yumcache
> installroot=%s
> logfile=/yum.log
> 
>@@ -351,9 +348,9 @@ name=%s
> baseurl=file://%s
> enabled=1
> 
>-""" % (yumcachedir, tmproot, self.config.name, arch, self.config.name, repodir)
>+""" % (tmproot, self.config.name, arch, self.config.name, repodir)
>         shutil.rmtree(tmproot, ignore_errors = True)
>-        os.makedirs(yumcachedir)
>+        os.makedirs(os.path.join(tmproot,"yumcache"))
>         os.makedirs(os.path.join(tmproot,'var/lib/rpm'))
>         yconfig_path = os.path.join(tmproot, 'yum.conf-%s-%s' % (self.config.name, arch))
>         f = open(yconfig_path, 'w')
>diff --git a/mash/config.py b/mash/config.py
>index f98f95c..003183e 100644
>--- a/mash/config.py
>+++ b/mash/config.py
>@@ -22,6 +22,7 @@ from yum import config
> class MashConfig(config.BaseConfig):
>     symlink = config.BoolOption(False)
>     rpm_path = config.Option('Mash')
>+    repodata_path = config.Option()
>     source_path = config.Option('source/SRPMS')
>     debuginfo = config.BoolOption(True)
>     debuginfo_path = config.Option('%(arch)s/debug')
>@@ -44,6 +45,7 @@ class MashDistroConfig(config.BaseConfig):
>     name = config.Option()
>     symlink = config.Inherit(MashConfig.symlink)
>     rpm_path = config.Inherit(MashConfig.rpm_path)
>+    repodata_path = config.Inherit(MashConfig.repodata_path)
>     source_path = config.Inherit(MashConfig.source_path)
>     debuginfo = config.Inherit(MashConfig.debuginfo)
>     debuginfo_path = config.Inherit(MashConfig.debuginfo_path)
>@@ -88,6 +90,8 @@ def readMainConfig(conf):
>                 thisdistro.populate(parser, sect, config)
>                 if not thisdistro.name:
>                     thisdistro.name = sect
>+                if not thisdistro.repodata_path:
>+                    thisdistro.repodata_path = os.path.dirname(thisdistro.rpm_path)
>                 thisdistro.keys = map(string.lower, thisdistro.keys)
>                 config.distros.append(thisdistro)
>     return config

Actions: View | Diff

Attachments on bug 350391: 261351 | 261371 | 261401 | 261641