- added support for format strings like "%(project)s" and "%(package)s" which can be used in the build-root config option.

For example one could use a new chroot for each package.

osc/build.py

@@ -303,7 +303,9 @@ def main(opts, argv):
                 print 'Overriding config value for %s=\'%s\' with \'%s\'' % (var, config[var], val)
             config[var] = val
 
-    config['build-root'] = config['build-root'] % {'repo': repo, 'arch': arch}
+    config['build-root'] = config['build-root'] % { 'repo': repo, 'arch': arch,
+                                                    'project' : prj, 'package' : pac
+                                                  }
 
     if not opts.extra_pkgs:
         extra_pkgs = config['extra-pkgs']

osc/conf.py

@@ -86,8 +86,9 @@ new_conf_template = """
 #su-wrapper = %(su-wrapper)s
 
 # rootdir to setup the chroot environment
-# can contain %%(repo)s and/or %%(arch)s for replacement, e.g.
-# /srv/oscbuild/%%(repo)s-%%(arch)s
+# can contain %%(repo)s, %%(arch)s, %%(project)s and %%(package)s for replacement, e.g.
+# /srv/oscbuild/%%(repo)s-%%(arch)s or
+# /srv/oscbuild/%%(repo)s-%%(arch)s-%%(project)s-%%(package)s
 #build-root = %(build-root)s
 
 # extra packages to install when building packages locally (osc build)