[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Don't write /etc/rpm/macros. (#650490)



Bill Nottingham (notting redhat com) said: 
> In particular, ppc is not the default over ppc64 these days.
> (Those willing to support sparc on this branch can patch it
> back in.)

This branch == rhel6-branch, if I wasn't obvious. Although, I
wouldn't argue against it on master either.

Bill

> 
> Signed-off-by: Bill Nottingham <notting redhat com>
> ---
>  iutil.py |   43 +------------------------------------------
>  1 files changed, 1 insertions(+), 42 deletions(-)
> 
> diff --git a/iutil.py b/iutil.py
> index 0b74e08..67d4bfa 100644
> --- a/iutil.py
> +++ b/iutil.py
> @@ -689,48 +689,7 @@ def isEfi():
>  ## Generate the /etc/rpm/macros file.
>  # @param root The root of the filesystem to create the files in.
>  def writeRpmPlatform(root="/"):
> -    import rpmUtils.arch
> -
> -    if os.access("%s/etc/rpm/platform" %(root,), os.R_OK):
> -        return
> -    if not os.access("%s/etc/rpm" %(root,), os.X_OK):
> -        os.mkdir("%s/etc/rpm" %(root,))
> -
> -    myarch = rpmUtils.arch.canonArch
> -
> -    # now allow an override with rpmarch=i586 on the command line (#101971)
> -    if flags.targetarch != None:
> -        myarch = flags.targetarch
> -
> -    # now make the current install believe it, too
> -    rpmUtils.arch.canonArch = myarch
> -
> -    # FIXME: writing /etc/rpm/macros feels wrong somehow
> -    # temporary workaround for #92285
> -    if not (myarch.startswith("ppc64") or
> -            myarch in ("s390x", "sparc64", "x86_64", "ia64")):
> -        return
> -    if os.access("%s/etc/rpm/macros" %(root,), os.R_OK):
> -        if myarch.startswith("ppc64") or myarch == "sparc64":
> -            f = open("%s/etc/rpm/macros" %(root,), 'r+')
> -            lines = f.readlines()
> -            addPrefer = True
> -            for line in lines:
> -                if line.startswith("%_prefer_color"):
> -                    addPrefer = False
> -            if addPrefer:    
> -                f.write("%_prefer_color   1\n")
> -            f.close()
> -            return
> -        else:
> -            return
> -
> -    f = open("%s/etc/rpm/macros" %(root,), 'w+')
> -    f.write("%_transaction_color   3\n")
> -    if myarch.startswith("ppc64") or myarch == "sparc64":
> -        f.write("%_prefer_color   1\n")
> -
> -    f.close()
> +    return
>  
>  # Architecture checking functions
>  
> -- 
> 1.7.3.2
> 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]