Package: git-buildpackage
Version: 0.6.8
Severity: important
Hi Guido,
Under certain conditions, git-dch ignores the values set in gbp.conf. I
have attached a shell log used to replicate the issue. I use a single,
system-wide gbp.conf.
In my example, 'git-dch' ignores my config when the section is called
[dch], but 'gbp dch' works okay. Changing the section to the legacy
[git-dch] name allows both commands to work correctly.
Marking as important as I fear this may affect all of the legacy git-*
gbp commands.
Thanks,
Jon
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (650, 'testing'), (600, 'unstable'), (450, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.11-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.13.9
ii git 1:1.8.5.2-1
ii man-db 2.6.5-2
ii python 2.7.5-5
ii python-dateutil 1.5+dfsg-0.1
ii python-pkg-resources 1.4.2-1
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.73
ii pristine-tar 1.28
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-3
ii unzip 6.0-10
-- Configuration Files:
/etc/git-buildpackage/gbp.conf changed [not included]
-- no debconf information
jmccrohan@lambda:~/src/debian/awesome-extra$ ls -lah /etc/git-buildpackage/gbp.conf ~/.gbp.conf .gbp.conf debian/gbp.conf .git/gbp.conf
ls: cannot access /home/jmccrohan/.gbp.conf: No such file or directory
ls: cannot access .gbp.conf: No such file or directory
ls: cannot access debian/gbp.conf: No such file or directory
ls: cannot access .git/gbp.conf: No such file or directory
-rw-r--r-- 1 root root 4.0K Dec 31 03:13 /etc/git-buildpackage/gbp.conf
jmccrohan@lambda:~/src/debian/awesome-extra$ cat /etc/git-buildpackage/gbp.conf
[DEFAULT]
builder = pdebuild
cleaner = fakeroot debian/rules clean
pristine-tar = True
color = auto
[buildpackage]
[import-orig]
[import-dsc]
[dch]
id-length = 7
git-author = True
customizations = /usr/share/doc/git-buildpackage/examples/wrap_cl.py
[pq]
[clone]
[pull]
[create-remote-repo]
[remote-config pkg-libvirt]
remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s
template-dir = /srv/alioth.debian.org/chroot/home/groups/pkg-libvirt/git-template
jmccrohan@lambda:~/src/debian/awesome-extra$ git-dch --ignore-branch
jmccrohan@lambda:~/src/debian/awesome-extra$ git diff debian/changelog
diff --git a/debian/changelog b/debian/changelog
index f30eaa6..784cbd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+awesome-extra (2012061102) UNRELEASED; urgency=medium
+
+ * d/control: Add myself to Uploaders
+ * d/control: Bump Standards-Version to 3.9.5
+ * d/{compat,control}: Bump debhelper version to 9
+ * The upstream obvious git repo (git.mercenariesguild.net/obvious.git) has gone AWOL; switch git submodule to HEAD of Rob Hoelz's forked version on github (which has support for awesome 3.5) (0585fb4)
+ * Update vicious (v2.1.2)
+ * Update bashlets (805558e)
+ * Update flaw (409a98b)
+ * Update shifty (b12b66e)
+
+ -- Jonathan McCrohan <jmccro...@gmail.com> Tue, 31 Dec 2013 16:52:19 +0000
+
awesome-extra (2012061101) unstable; urgency=low
* Update revelation
jmccrohan@lambda:~/src/debian/awesome-extra$ git checkout debian/changelog
jmccrohan@lambda:~/src/debian/awesome-extra$ gbp dch --ignore-branch
jmccrohan@lambda:~/src/debian/awesome-extra$ git diff debian/changelog
diff --git a/debian/changelog b/debian/changelog
index f30eaa6..a0abed1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+awesome-extra (2012061102) UNRELEASED; urgency=medium
+
+ * [6ab7883] d/control: Add myself to Uploaders
+ * [02eba78] d/control: Bump Standards-Version to 3.9.5
+ * [0d8188d] d/{compat,control}: Bump debhelper version to 9
+ * [0a9296e] The upstream obvious git repo
+ (git.mercenariesguild.net/obvious.git) has gone AWOL; switch git
+ submodule to HEAD of Rob Hoelz's forked version on github (which has
+ support for awesome 3.5) (0585fb4)
+ * [f62c5ed] Update vicious (v2.1.2)
+ * [f3768c2] Update bashlets (805558e)
+ * [e8305a0] Update flaw (409a98b)
+ * [2c90ccf] Update shifty (b12b66e)
+
+ -- Jonathan McCrohan <jmccro...@gmail.com> Tue, 31 Dec 2013 16:52:48 +0000
+
awesome-extra (2012061101) unstable; urgency=low
* Update revelation
jmccrohan@lambda:~/src/debian/awesome-extra$ sudo sed -i 's/dch/git-dch/' /etc/git-buildpackage/gbp.conf
jmccrohan@lambda:~/src/debian/awesome-extra$ git checkout debian/changelog
jmccrohan@lambda:~/src/debian/awesome-extra$ git-dch --ignore-branch
jmccrohan@lambda:~/src/debian/awesome-extra$ git diff debian/changelog
diff --git a/debian/changelog b/debian/changelog
index f30eaa6..aacb3a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+awesome-extra (2012061102) UNRELEASED; urgency=medium
+
+ * [6ab7883] d/control: Add myself to Uploaders
+ * [02eba78] d/control: Bump Standards-Version to 3.9.5
+ * [0d8188d] d/{compat,control}: Bump debhelper version to 9
+ * [0a9296e] The upstream obvious git repo
+ (git.mercenariesguild.net/obvious.git) has gone AWOL; switch git
+ submodule to HEAD of Rob Hoelz's forked version on github (which has
+ support for awesome 3.5) (0585fb4)
+ * [f62c5ed] Update vicious (v2.1.2)
+ * [f3768c2] Update bashlets (805558e)
+ * [e8305a0] Update flaw (409a98b)
+ * [2c90ccf] Update shifty (b12b66e)
+
+ -- Jonathan McCrohan <jmccro...@gmail.com> Tue, 31 Dec 2013 16:54:48 +0000
+
awesome-extra (2012061101) unstable; urgency=low
* Update revelation
jmccrohan@lambda:~/src/debian/awesome-extra$
