From e501d75e9a4414727e1ec957c3fcd00975bfdf54 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Jun 08 2018 18:50:40 +0000 Subject: Use base_module in clone_config When cloning a module with a namespace, the `module` variable contains the namespace prefix. As used in `clone_config` (specifically, as currently used in `bz.default-component` and `sendemail.to`), the namespace prefix is not intended to be part of the value. For example: $ fedpkg clone rpms/git Cloning into 'git'... ... $ cd git && git config --get-regexp 'bz.default-component|sendemail.to' bz.default-component rpms/git sendemail.to rpms/git-owner@fedoraproject.org Use base_module for these values which strips the namespace prefix from module. Resolves: #230 Signed-off-by: Todd Zullinger --- diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf index 0118a53..9a2180b 100644 --- a/conf/etc/rpkg/fedpkg-stage.conf +++ b/conf/etc/rpkg/fedpkg-stage.conf @@ -11,8 +11,8 @@ clone_config = bz.default-tracker partner-bugzilla.redhat.com bz.default-product Fedora bz.default-version rawhide - bz.default-component %(module)s - sendemail.to %(module)s-owner@fedoraproject.org + bz.default-component %(base_module)s + sendemail.to %(base_module)s-owner@fedoraproject.org distgit_namespaced = True lookaside_namespaced = True kerberos_realms = STG.FEDORAPROJECT.ORG diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf index 88fd0e5..5da94c7 100644 --- a/conf/etc/rpkg/fedpkg.conf +++ b/conf/etc/rpkg/fedpkg.conf @@ -11,8 +11,8 @@ clone_config = bz.default-tracker bugzilla.redhat.com bz.default-product Fedora bz.default-version rawhide - bz.default-component %(module)s - sendemail.to %(module)s-owner@fedoraproject.org + bz.default-component %(base_module)s + sendemail.to %(base_module)s-owner@fedoraproject.org distgit_namespaced = True lookaside_namespaced = True kerberos_realms = FEDORAPROJECT.ORG