Markus Lehtonen [Mon, 21 Jul 2014 09:46:40 +0000 (12:46 +0300)]
rpm tests: disable one anomalous pylint error
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 25 Jul 2014 05:58:23 +0000 (08:58 +0300)]
tests: add tests for UpstreamSource.guess_version()
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 6 Jun 2013 11:53:45 +0000 (14:53 +0300)]
UpstreamSource.guess_version: recognise debian native tarballs
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 18 Jul 2014 12:37:48 +0000 (15:37 +0300)]
ComponentTestBase: add dirs argument to _check_repo_state()
Make difference between regular files and directories, eliminating the
requirement of listing directories in the file list.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 26 Jun 2014 07:05:01 +0000 (10:05 +0300)]
ComponentTestBase: add ls_tree() method
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 26 Jun 2014 07:01:18 +0000 (10:01 +0300)]
ComponentTestBase: add check_files() method
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 2 Oct 2013 13:35:32 +0000 (16:35 +0300)]
ComponentTestBase: add a per-class toplevel temp dir
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 26 Jun 2014 10:35:19 +0000 (13:35 +0300)]
ComponentTestBase: ignore system and user config
User might have a system and/or user specific gbp config files. Disable
these config files so that they don't affect the component tests.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 10 Jul 2014 08:26:19 +0000 (11:26 +0300)]
log: fix auto colorizing for custom streams
Check for existence of isatty() method in the stream object. Some custom
streams (e.g. in nose) do not necessarily have this.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 12 Jun 2014 09:04:09 +0000 (12:04 +0300)]
notify: catch RuntimeError when importing pynotify
Work around a problem in some distros (e.g. Fedora) where "import
pynotify" crashes in RuntimeError in some cases, e.g. when DISPLAY env
variable is not set.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 6 Jun 2014 07:22:31 +0000 (10:22 +0300)]
gbp-dch: fix handling of the '--meta' option
Make it effective again - previously it was totally ignored. Also,
change it's default value to True to match the current behavior.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Wed, 29 Oct 2014 06:47:29 +0000 (07:47 +0100)]
Document changes and release 0.6.22
Guido Günther [Wed, 29 Oct 2014 06:46:35 +0000 (07:46 +0100)]
git.vfs: fix close method
Preventing a infinite recursion which can be triggered by gbp pq export
--commit.
Guido Günther [Fri, 17 Oct 2014 16:41:21 +0000 (18:41 +0200)]
Document changes and release 0.6.21
Guido Günther [Fri, 17 Oct 2014 16:29:15 +0000 (18:29 +0200)]
Update README a bit
Git-Dch: Ignore
Guido Günther [Fri, 17 Oct 2014 16:24:01 +0000 (18:24 +0200)]
Complete setup.py for pypi
Guido Günther [Fri, 17 Oct 2014 15:31:48 +0000 (17:31 +0200)]
Improve change reporting a bit
Guido Günther [Fri, 17 Oct 2014 11:01:34 +0000 (13:01 +0200)]
man: fix option argument for --git-pbuilder-options
Guido Günther [Tue, 14 Oct 2014 17:18:20 +0000 (19:18 +0200)]
pq: Don't fail commit if the series file is empty on the source branch
Guido Günther [Sun, 12 Oct 2014 09:42:52 +0000 (11:42 +0200)]
Document changes and release 0.6.20
Guido Günther [Sat, 6 Sep 2014 11:40:14 +0000 (13:40 +0200)]
pq: Add "pq export --commit" option
This commits the changes in the pq right away. This is currently
experimental and subject to change.
Guido Günther [Fri, 26 Sep 2014 08:31:48 +0000 (10:31 +0200)]
meta-closes: Move help text to GbpOptionParser.help
Guido Günther [Sat, 13 Sep 2014 10:53:15 +0000 (12:53 +0200)]
pq: document --drop
Guido Günther [Fri, 12 Sep 2014 11:05:47 +0000 (13:05 +0200)]
Allow to always drop pq branch after export
Closes: #761160
Guido Günther [Sun, 7 Sep 2014 07:25:53 +0000 (09:25 +0200)]
Document changes and release 0.6.19
Guido Günther [Sun, 7 Sep 2014 07:25:30 +0000 (09:25 +0200)]
Update to git-pbuilder 1.33
Guido Günther [Sat, 6 Sep 2014 11:41:27 +0000 (13:41 +0200)]
Document changes and release 0.6.18
Guido Günther [Mon, 1 Sep 2014 07:36:11 +0000 (09:36 +0200)]
Mention --no-merge
Closes: #760091
Guido Günther [Tue, 26 Aug 2014 09:08:27 +0000 (11:08 +0200)]
Don't delete *_source.changes on source only builds
Closes: #758726
Guido Günther [Sun, 24 Aug 2014 09:31:57 +0000 (11:31 +0200)]
Document changes and release 0.6.17
Guido Günther [Sun, 24 Aug 2014 09:24:52 +0000 (11:24 +0200)]
bash completion: make command list dynamic
Use "gbp --list-cmds" so we don't have to hardcode the available
commands and get support for the RPM ones as they show up.
Guido Günther [Sat, 23 Aug 2014 16:18:10 +0000 (18:18 +0200)]
Unify doc strings a bit
since they now show up with --list-cmds
Guido Günther [Sat, 23 Aug 2014 16:10:16 +0000 (18:10 +0200)]
Allow to list all available commands
Guido Günther [Sat, 23 Aug 2014 13:14:18 +0000 (15:14 +0200)]
gbp: add --version option
Closes: #758909
Guido Günther [Tue, 19 Aug 2014 18:07:35 +0000 (20:07 +0200)]
Improve error messages on formatting errors
Make it easier for the user to detect misformated replacement strings in
config files and command line options.
Kamal Mostafa [Tue, 19 Aug 2014 15:14:47 +0000 (17:14 +0200)]
buildpackage: Make debian-tag message configurable
New config option --git-debian-tag-msg allows for the specification of
the message format string for signed debian-tags.
When left unset, the default debian-tag-msg format is still:
%(pkg)s Debian release %(version)s
Signed-off-by: Kamal Mostafa <kamal@whence.com>
Bla Fasel [Mon, 11 Aug 2014 09:09:32 +0000 (11:09 +0200)]
dch: Only modify the mainttrailer when --git-author is in use
Bla Fasel [Mon, 11 Aug 2014 09:00:16 +0000 (11:00 +0200)]
Use better variable name
It's a boolean indicating wether we fetch the author information from
git not the author information itself.
Git-Dch: Ignore
Bla Fasel [Sun, 10 Aug 2014 23:29:26 +0000 (01:29 +0200)]
Brown paper bag, please
Gbp-Dch: Ignore
Guido Günther [Sun, 10 Aug 2014 23:00:05 +0000 (01:00 +0200)]
Make sure we fixup the changelog trailer with newer devscripts
We don't change any mainttrailer options if already given.
Thanks: James McCoy for the detailed explanation
Closes: #740566
Guido Günther [Mon, 28 Jul 2014 14:00:12 +0000 (16:00 +0200)]
Document changes and release 0.6.16
Guido Günther [Mon, 28 Jul 2014 13:57:05 +0000 (15:57 +0200)]
Remove all other log handlers when capturing logs
This avoids spurious error messages during test runs.
Guido Günther [Mon, 28 Jul 2014 13:35:01 +0000 (15:35 +0200)]
linkeList: turn the bug printouts to debug level
We don't take any action anyway so no need to confuse users.
Guido Günther [Thu, 24 Jul 2014 21:12:30 +0000 (23:12 +0200)]
Introduce git-buildpackage-rpm
Currently only including "gbp import-srpm"
Markus Lehtonen [Thu, 12 Jan 2012 13:45:06 +0000 (15:45 +0200)]
import-srpm: add 'vendor' config option
Intended to represent the distribution vendor (e.g. 'Debian').
Currently, this can be used in tag format strings.
NOTE: the vendor name is converted to lowercase when used in tag names.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Thu, 24 Jul 2014 19:37:58 +0000 (21:37 +0200)]
Pass --no-pristine-tar to SRPM compnent tests
to avoid pristine-tar showing up in the matched branches
Markus Lehtonen [Thu, 12 Jan 2012 13:37:49 +0000 (15:37 +0200)]
Introduce git-import-srpm tool
Initial version of the git-import-srpm: a tool for importing source
rpms.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Markus Lehtonen [Wed, 11 Jul 2012 13:03:56 +0000 (16:03 +0300)]
Add gbp specific tempfile module
Minimal initial implementation that only adds tempdir parent directory
creation.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Olev Kartau <olev.kartau@intel.com>
Markus Lehtonen [Thu, 12 Jan 2012 13:29:03 +0000 (15:29 +0200)]
Introduce rpm helpers
Implements a new gbp.rpm module that contains functionality for e.g.
parsing and editing spec files, reading src.rpm files rpm-specific
packaging policy etc.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
Signed-off-by: Huang Hao <hao.h.huang@intel.com>
Guido Günther [Thu, 24 Jul 2014 21:13:03 +0000 (23:13 +0200)]
Make pychecker happy
We don't use the class variable anywhere
Markus Lehtonen [Fri, 23 Aug 2013 10:39:19 +0000 (13:39 +0300)]
UpstreamSource: move version guessing logic to PkgPolicy
PkgPolicy is more logical context, for example if guessing version from
a plain filename and not a real file.
Also, changes guess_version() to always return a tuple to simplify
checking its return value.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Conflicts:
gbp/pkg/__init__.py
Markus Lehtonen [Mon, 9 Jul 2012 12:17:24 +0000 (15:17 +0300)]
Change UpstreamSource to have PkgPolicy
The UpstreamSource class now gets a PkgPolicy in it's initialization.
Also, introduces new DebiaUpstreamSource class which is taken in use in
the scripts.
The PkgPolicy is not yet used for anything in UpstreamSource.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 26 Aug 2013 13:47:57 +0000 (16:47 +0300)]
UpstreamSource.guess_version: don't check for directories
Directories are not recognized anyway, if guess_version() is called for
non-existent sources. And, parse_archive_filename() works fine for
directory names, too.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 27 Sep 2012 07:24:28 +0000 (10:24 +0300)]
UpstreamSource/guess_version: detect more compression formats
By utilizing the parse_archive_filename() function that detects e.g.
"alias suffixes" such as 'tgz'.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Thu, 24 Jul 2014 17:43:25 +0000 (19:43 +0200)]
Fix typos
Markus Lehtonen [Tue, 15 May 2012 07:02:40 +0000 (10:02 +0300)]
Move get_compression() out of pkg.PkgPolicy class
Renames the function to parse_archive_filename() and changes it's
return values. Filename parsing is merely generic functionality, not
tied to any packaging policy.
The function now returns the base name of the file (that is, filename
without, archive and compression extensions), archive format and
compression method. Adds supported archive formats 'tar' and 'zip' and
file extension aliases, e.g. 'tgz'.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 21 May 2014 07:24:21 +0000 (10:24 +0300)]
docs: document common options in one place
Move the documentation of command line options common to all tools into
one file. This unifies the manpage documentation and should make its
maintenance easier. Also, this change adds missing options to several
manpages.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 9 May 2014 11:40:25 +0000 (14:40 +0300)]
docs: cosmetic reformat of git-dch manpage sgml source
Makes the sgml source more readable. Fix indentation, tab to space, wrap
lines.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 9 May 2014 11:40:25 +0000 (14:40 +0300)]
docs: cosmetic reformat of pq manpage sgml source
Makes the sgml source more readable. Fix indentation, tab to space, wrap
lines.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 9 May 2014 11:40:25 +0000 (14:40 +0300)]
docs: cosmetic reformat of import-dsc manpage sgml source
Makes the sgml source more readable. Fix indentation, tab to space, wrap
lines.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 9 May 2014 11:40:25 +0000 (14:40 +0300)]
docs: cosmetic reformat of import-orig manpage sgml source
Makes the sgml source more readable. Fix indentation, tab to space, wrap
lines.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 9 May 2014 12:04:20 +0000 (15:04 +0300)]
docs: change option argument names to uppercase in buildpackage man
For the sake of consistency.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 9 May 2014 11:40:25 +0000 (14:40 +0300)]
docs: cosmetic reformat of buildpackage manpage sgml source
In order to make the sgml source more readable. Fix indentation, tab to
space, wrap lines.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Sat, 14 Jun 2014 09:55:17 +0000 (11:55 +0200)]
buildpackage: Also print tag name when tagging the Debian release
Based on a patch by Kamal Mostafa
Markus Lehtonen [Thu, 8 May 2014 12:35:26 +0000 (15:35 +0300)]
docs: more flexible version parsing in Makefile
Add dash to the list of valid version characters.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 26 May 2014 10:24:23 +0000 (13:24 +0300)]
docs: document the --customizations option of gbp dch
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 21 May 2014 10:57:52 +0000 (13:57 +0300)]
docs: document the --interactive option of gbp-import-orig
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 8 May 2014 14:40:16 +0000 (17:40 +0300)]
docs: document the --git-[no-]submodules option
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 8 May 2014 13:19:19 +0000 (16:19 +0300)]
docs: document the --color-scheme option
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 5 May 2014 12:14:45 +0000 (15:14 +0300)]
docs: sgml syntax fix, add missing semicolons
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 30 Apr 2014 10:21:22 +0000 (13:21 +0300)]
docs: reference buildpackage and pq in the gbp (supercommand) manpage
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 30 Apr 2014 08:30:11 +0000 (11:30 +0300)]
docs: hyperlink references to other manpages
Change references to other gbp manpages to linked refs so that we get
hyperlinks in the html manpages.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 30 Apr 2014 10:40:12 +0000 (13:40 +0300)]
docs: add some missing commas to manpages
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Sat, 24 May 2014 16:41:05 +0000 (18:41 +0200)]
Document changes and release 0.6.15
Guido Günther [Sat, 24 May 2014 16:40:35 +0000 (18:40 +0200)]
Revert "Determine build_dir upfront"
This reverts commit
b2549fac19f2d666552291a4fcf2020ca0570834.
Guido Günther [Thu, 22 May 2014 20:49:01 +0000 (22:49 +0200)]
Document changes and release 0.6.14
Guido Günther [Thu, 22 May 2014 11:20:11 +0000 (13:20 +0200)]
Improve error reporting on hooks
Make it obvious that a hook failed and not a gbp internal function
Guido Günther [Thu, 22 May 2014 11:00:15 +0000 (13:00 +0200)]
Improve error reporting on failed commands
Make it more clear if the command exited with non zero exit status.
Also don't report the command line twice.
Closes: #748248
Guido Günther [Thu, 22 May 2014 12:53:47 +0000 (14:53 +0200)]
Determine build_dir upfront
so it's available to all hooks
Guido Günther [Mon, 19 May 2014 10:06:39 +0000 (12:06 +0200)]
pq: Try harder to cleanup after a failed patch
If we fail to apply the patch the tree is left in a dirty state
so reset to the last head. This avoids irritating errors like:
gbp:error: Failed to apply 'debian/patches/poison+remember_trash': Failed to commit tree: fatal: invalid date format: 1998/03/21
following files would be overwritten by checkout:
doc/hosts.nntp.5
innd/art.c
innd/innd.h
innd/rc.c
Please, commit your changes or stash them before you can switch branches.
Aborting
Thanks: Marco d'Itri for the repo to debug this
Guido Günther [Mon, 19 May 2014 10:06:08 +0000 (12:06 +0200)]
pq: Print proper error message if we fail to apply the tree
e.g. instead of
gbp:error: Failed to apply 'debian/patches/poison+remember_trash'
we now have
gbp:error: Failed to apply 'debian/patches/poison+remember_trash': Failed to commit tree: fatal: invalid date format: 1998/03/21
Guido Günther [Mon, 19 May 2014 09:34:01 +0000 (11:34 +0200)]
Documnt that the patches must apply without fuzz
Guido Günther [Fri, 16 May 2014 17:51:26 +0000 (19:51 +0200)]
Fix comitter vs committer typos
Thanks: Sandro Tosi
Closes: #748339
Guido Günther [Wed, 7 May 2014 18:35:48 +0000 (20:35 +0200)]
Handle version format errors more gracefully
So far if a package claimed to be non native but the version number
didn't contain a '-' we failed like:
Traceback (most recent call last):
File "/usr/bin/gbp", line 9, in <module>
load_entry_point('gbp==0.6.13', 'console_scripts', 'gbp')()
File "/usr/lib/python2.7/dist-packages/gbp/scripts/supercommand.py", line 82, in supercommand
return module.main(args)
File "/usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage.py", line 541, in main
output_dir)
File "/usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage.py", line 96, in prepare_upstream_tarball
upstream_tree = git_archive_build_orig(repo, cp, output_dir, options)
File "/usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage.py", line 270, in git_archive_build_orig
upstream_tree = get_upstream_tree(repo, cp, options)
File "/usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage.py", line 245, in get_upstream_tree
cp['Upstream-Version'])
File "/usr/lib/python2.7/dist-packages/gbp/deb/git.py", line 107, in version_to_tag
return format % dict(version=DebianGitRepository._sanitize_version(version))
File "/usr/lib/python2.7/dist-packages/gbp/deb/git.py", line 122, in _sanitize_version
return version.replace('~', '_').replace(':', '%')
It shouldn't be like that.
Guido Günther [Fri, 2 May 2014 15:10:48 +0000 (17:10 +0200)]
gbp pq: document --force
Guido Günther [Fri, 4 Apr 2014 10:57:30 +0000 (12:57 +0200)]
Slightly improve usage output
Guido Günther [Thu, 3 Apr 2014 19:32:22 +0000 (21:32 +0200)]
Document changes and release 0.6.13
Guido Günther [Wed, 2 Apr 2014 20:13:46 +0000 (22:13 +0200)]
config: add decorator to add_option_* functions
This allows us to build an internal list of valid options and print
these.
Guido Günther [Wed, 2 Apr 2014 22:04:18 +0000 (00:04 +0200)]
Import command not module
This matches the function name
Markus Lehtonen [Thu, 3 Apr 2014 04:21:05 +0000 (07:21 +0300)]
docs: re-enable missing manpage
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Wed, 2 Apr 2014 14:56:06 +0000 (16:56 +0200)]
Remove tests now covered by 18_test_Config
Markus Lehtonen [Wed, 2 Apr 2014 06:48:11 +0000 (09:48 +0300)]
Revert "GitRepository/add_remote_repo: fix the 'tags' argument"
Which caused an unwanted behavior of not fetching refs/heads at all --
only tags were fetched.
This reverts commit
5dd598fb8f2a9109189fad6cf631811f12ce2130
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Guido Günther [Tue, 1 Apr 2014 18:29:22 +0000 (20:29 +0200)]
Add minimal 'config' command
This only allows to print single config values so far.
Closes: #733470
Guido Günther [Tue, 1 Apr 2014 09:35:50 +0000 (11:35 +0200)]
.gitignore: ignore editor backup files
Guido Günther [Tue, 1 Apr 2014 08:03:35 +0000 (10:03 +0200)]
Test option parser fallbacks more thoroughly
revealing another bug where we overwrote parsed values with defaults
Closes: #733759
Guido Günther [Fri, 28 Mar 2014 23:18:09 +0000 (00:18 +0100)]
Document changes and release 0.6.12
Guido Günther [Fri, 28 Mar 2014 23:07:29 +0000 (00:07 +0100)]
Use a much simpler version to fix the command name in --help
mostly reverting e1780f0.
Closes: #742907
Guido Günther [Thu, 27 Mar 2014 21:28:50 +0000 (22:28 +0100)]
Document changes and release 0.6.11
Guido Günther [Thu, 27 Mar 2014 20:22:25 +0000 (21:22 +0100)]
Fix command output
The first line lacked the subcommand like:
$ gbp pull --help
Usage: gbp [options] - safely update a repository from remote
instead of
$ gbp pull --help
Usage: gbp pull [options] - safely update a repository from remote
^^^^
Markus Lehtonen [Thu, 12 Dec 2013 09:14:06 +0000 (11:14 +0200)]
ComponentTestBase: use regex matching in log checking
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>