Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[M] Made logback.xml a config file to prevent overwriting (ENT-5300) #3541

Merged
merged 1 commit into from
Aug 30, 2022

Conversation

joshmalbrecht
Copy link
Contributor

I was unable to test these changes as the tito build --rpm --test --verbose command is not working for me.

The error that I was running into when attempting to run the tito command:

Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.swWspV
+ umask 022
+ cd /tmp/tito/rpmbuild-candlepinxisoscm9/BUILD
+ cd /tmp/tito/rpmbuild-candlepinxisoscm9/BUILD
+ rm -rf candlepin-4.2.7
+ /usr/bin/gzip -dc /tmp/tito/rpmbuild-candlepinxisoscm9/SOURCES/candlepin-4.2.7-complete.tar.gz
+ /usr/bin/tar -xof -
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ cd candlepin-4.2.7
+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
+ pathfix.py -pni '/usr/bin/python3 -s' bin/scripts/code/setup/cpdb bin/scripts/code/setup/cpsetup
usage: pathfix.py [-h] [--config CONFIG] path
pathfix.py: error: unrecognized arguments: -pni bin/scripts/code/setup/cpdb bin/scripts/code/setup/cpsetup
error: Bad exit status from /var/tmp/rpm-tmp.swWspV (%prep)

RPM build warnings:
    line 23: It's not recommended to have unversioned Obsoletes: Obsoletes: candlepin-tomcat
    line 24: It's not recommended to have unversioned Obsoletes: Obsoletes: candlepin-tomcat6
    line 25: It's not recommended to have unversioned Obsoletes: Obsoletes: candlepin-devel
    line 26: It's not recommended to have unversioned Obsoletes: Obsoletes: candlepin-certgen-lib
    line 23: It's not recommended to have unversioned Obsoletes: Obsoletes: candlepin-tomcat
    line 24: It's not recommended to have unversioned Obsoletes: Obsoletes: candlepin-tomcat6
    line 25: It's not recommended to have unversioned Obsoletes: Obsoletes: candlepin-devel
    line 26: It's not recommended to have unversioned Obsoletes: Obsoletes: candlepin-certgen-lib

RPM build errors:
    Bad exit status from /var/tmp/rpm-tmp.swWspV (%prep)

@nikosmoum nikosmoum requested review from a team and Ceiu and removed request for a team August 29, 2022 14:12
Copy link
Contributor

@Ceiu Ceiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change itself looks fine, but the commit formatting and PR title formatting need to be updated:

  • The commit addresses a specific BZ, so it should follow the syntax: BZ#: commit title
  • The PR title doesn't indicate the Jira number nor the branch tag

@joshmalbrecht joshmalbrecht changed the title Made logback.xml a config file to prevent overwriting [M] Made logback.xml a config file to prevent overwriting (ENT-5300) Aug 29, 2022
@Ceiu
Copy link
Contributor

Ceiu commented Aug 29, 2022

Looks good to me (and seems simple enough), but it would probably be a good idea to have someone more familiar with the RPM spec bits to confirm. @nikosmoum perhaps?

candlepin.spec.tmpl Outdated Show resolved Hide resolved
@nikosmoum
Copy link
Member

And one more thing change the BZ id to the candlepin BZ (2112308) which is what we are using in our commits. 1787456 is the satellite BZ id which we don't use in commits

@nikosmoum nikosmoum merged commit 5c97f1c into master Aug 30, 2022
@nikosmoum nikosmoum deleted the jalbrech/m/ENT-5300 branch August 30, 2022 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants