[lorax master/f22] include variant in the name for .treeinfo when it exists

Dennis Gilmore dennis at ausil.us
Tue Mar 10 15:00:29 UTC 2015


For some further background info on this. while I was working on 
https://fedorahosted.org/rel-eng/ticket/6008 I realised pungi has been doing 
things wrong for years. it was not building the file names correctly. it was 
using name which is the Family. we do not want the Server, Workstation, Cloud 
install isos to all be named the same. which they would be if we used just 
Fedora for the name/family.  I renamed everything in pungi to be consistent 
with the naming in lorax. This patch enables us to get the same behaviour as 
we had in Fedora 21 but fix up .treeinfo to have the Family be just Fedora 
which will then result in the Family in the .composeinfo file being Fedora 
also.

If you look at the .treeinfo file[2] from Fedora 21 Server you can see that 
the family field in  the general section is wrong, which translates to the 
family field in the product section of the .composeinfo[3] file being wrong 
also. at least to be consistent with what we have done previously we need to 
add the variant to the name field of the .treeinfo file. if we do not then the 
name  for all products install trees will be Fedora-22 in fedora 22, maybe 
that is okay, but I personally do not think so. 

Dennis

[1] 
https://git.fedorahosted.org/cgit/pungi.git/commit/?id=35e5af98184482b66f29471f9e245aa0da5a7bb8
[2] 
http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/armhfp/os/.treeinfo
[3] 
http://dl.fedoraproject.org/pub/fedora/linux/releases/21/Server/.composeinfo

On Monday, March 09, 2015 05:21:09 PM you wrote:
> if there is a variant set include that in the name, otherwise
> all the variants end up having the same name set.
> 
> Signed-off-by: Dennis Gilmore <dennis at ausil.us>
> ---
>  src/pylorax/treeinfo.py | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/src/pylorax/treeinfo.py b/src/pylorax/treeinfo.py
> index 6f3f620..692b08f 100644
> --- a/src/pylorax/treeinfo.py
> +++ b/src/pylorax/treeinfo.py
> @@ -33,11 +33,16 @@ class TreeInfo(object):
> 
>          self.c = ConfigParser.ConfigParser()
> 
> +        if variant:
> +            name = "%s-%s-%s" % (product, variant, version)
> +        else:
> +            name = "%s-%s" % (product, version)
> +
>          section = "general"
>          data = {"timestamp": time.time(),
>                  "family": product,
>                  "version": version,
> -                "name": "%s-%s" % (product, version),
> +                "name": name,
>                  "variant": variant or "",
>                  "arch": basearch,
>                  "packagedir": packagedir}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.fedorahosted.org/pipermail/anaconda-patches/attachments/20150310/353834d7/attachment-0001.sig>


More information about the anaconda-patches mailing list