PR#142: Flag day changes needed for fedora-packager - fedora-packager

Dennis Gilmore • 8 years ago

bda3b46

Dennis Gilmore • 8 years ago

154472e

Dennis Gilmore • 8 years ago

7308f0a

Makefile.am

file modified

+1 -1

		`@@ -77,7 +77,7 @@`
		`$(srcdir)/configs/ppc-config \`
		`$(srcdir)/configs/s390-config \`
		`$(srcdir)/configs/stg-config`
		`- kojiconfdir = $(sysconfdir)/koji`
		`+ kojiconfdir = $(sysconfdir)/koji.conf.d/`

		`EXTRA_DIST += krb-configs/fedoraproject_org \`
		`krb-configs/stg_fedoraproject_org`

README

file modified

+8 -1

		`@@ -1,1 +1,8 @@`
		`- Added a wrapper for old style hashes in rpm rpmbuild-md5`
		`+ fedora-packager is a collection of tools and configuration files to enable developers`
		`+ to set up their development environment. it also provides a python library fedora_cert`
		`+ to manage koji certificates.`
		`+`
		`+ for contributoons fork fedora-packager at https://pagure.io/fedora-packager/ and submit`
		`+ pull requests.`
		`+`
		`+ File issues with fedora-packager at https://pagure.io/fedora-packager/`

configs/arm-config

file modified

+2 -9

		`@@ -1,4 +1,4 @@`
		`- [koji]`
		`+ [arm]`

		`;configuration for koji cli tool`

		`@@ -11,12 +11,5 @@`
		`;url of package download site`
		`topurl = http://armpkgs.fedoraproject.org/`

		`-`
		`- ;configuration for SSL athentication`
		`-`
		`- ;client certificate`
		`- cert = ~/.fedora.cert`
		`-`
		`- ;certificate of the CA that issued the HTTP server certificate`
		`- serverca = ~/.fedora-server-ca.cert`
		`+ authtype = kerberos`

configs/ppc-config

file modified

+2 -9

		`@@ -1,4 +1,4 @@`
		`- [koji]`
		`+ [ppc]`

		`;configuration for koji cli tool`

		`@@ -11,11 +11,4 @@`
		`;url of package download site`
		`topurl = http://ppc.koji.fedoraproject.org/`

		`- ;configuration for SSL athentication`
		`-`
		`- ;client certificate`
		`- cert = ~/.fedora.cert`
		`-`
		`- ;certificate of the CA that issued the HTTP server certificate`
		`- serverca = ~/.fedora-server-ca.cert`
		`-`
		`+ authtype = kerberos`

configs/s390-config

file modified

+2 -9

		`@@ -1,4 +1,4 @@`
		`- [koji]`
		`+ [s390]`

		`;configuration for koji cli tool`

		`@@ -11,11 +11,4 @@`
		`;url of package download site`
		`topurl = http://s390pkgs.fedoraproject.org/`

		`- ;configuration for SSL athentication`
		`-`
		`- ;client certificate`
		`- cert = ~/.fedora.cert`
		`-`
		`- ;certificate of the CA that issued the HTTP server certificate`
		`- serverca = ~/.fedora-server-ca.cert`
		`-`
		`+ authtype = kerberos`

configs/stg-config

file modified

+2 -10

		`@@ -1,4 +1,4 @@`
		`- [koji]`
		`+ [stg]`

		`;configuration for koji cli tool`

		`@@ -11,12 +11,4 @@`
		`;url of package download site`
		`topurl = http://kojipkgs.stg.fedoraproject.org/`

		`-`
		`- ;configuration for SSL athentication`
		`-`
		`- ;client certificate`
		`- cert = ~/.fedora.cert`
		`-`
		`- ;certificate of the CA that issued the HTTP server certificate`
		`- serverca = ~/.fedora-server-ca.cert`
		`-`
		`+ authtype = kerberos`

configure.ac

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- AC_INIT([fedora-packager], [0.5.10.7])`
		`+ AC_INIT([fedora-packager], [0.5.10.8])`
		`AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip tar-pax])`
		`AM_PATH_PYTHON(,, [:])`
		`AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])`

src/secondary-koji

file modified

+2 -2

		`@@ -2,11 +2,11 @@`

		arch=`basename $0 \| cut -d '-' -f 1`

		`- config="/etc/koji/${arch}-config"`
		`+ config="/etc/koji.conf.d/${arch}-config"`

		`if [ ! -f $config ]; then`
		`echo "Config file for $arch doesn't exist"`
		`exit 1`
		`fi`

		`- koji -c $config "$@"`
		`+ koji --profile ${arch} "$@"`
alert("boo! (puiterwijk was here)"); Uiterwijk (puiterwijk)">puiterwijk commented 8 years ago So we go from defining the configuration file location to defining the profile and ignoring the $config?
ausil commented 8 years ago that's how profiles work. koji loads all configs, and uses the one matching the profile
ausil commented 8 years ago it is why we changed [koji] to [$arch] in each config