tools/gbs.git
12 years agoUpdate gbs version from source
Zhang Qiang [Thu, 20 Sep 2012 04:20:49 +0000 (12:20 +0800)]
Update gbs version from source

This affect output of gbs --version

Change-Id: Ia994406218fc41e08c544c7509ffe409aca9d2cb

12 years agoUpdate gbs build help info use build instead of localbuild
Zhang Qiang [Thu, 20 Sep 2012 04:09:50 +0000 (12:09 +0800)]
Update gbs build help info use build instead of localbuild

Change-Id: I50e182dbf7d626989b51c811d891296b16210fe0

12 years agoDon't use local build conf, give error msg instead
Zhang Qiang [Thu, 20 Sep 2012 03:11:51 +0000 (11:11 +0800)]
Don't use local build conf, give error msg instead

local build conf is out of date, and should be discarded.

Change-Id: Iba23ae5cfe082b8e11aac033e0128cf047506a5b

12 years agoMerge "transfer correct gbs export options to depanneur" into release-0.10
Zhang Qiang [Thu, 20 Sep 2012 05:06:36 +0000 (22:06 -0700)]
Merge "transfer correct gbs export options to depanneur" into release-0.10

12 years agoSmall changes to usage format
Huang Hao [Thu, 20 Sep 2012 03:49:13 +0000 (11:49 +0800)]
Small changes to usage format

Change-Id: I1778037d94a9c5ef56be7352a9b9f9fda688d678

12 years agotransfer correct gbs export options to depanneur
Zhang Qiang [Wed, 19 Sep 2012 13:44:23 +0000 (21:44 +0800)]
transfer correct gbs export options to depanneur

Change-Id: If988d075a91392434d0619662e131291d0bc2123

12 years agobump to version 0.10
Zhang Qiang [Wed, 19 Sep 2012 09:15:56 +0000 (17:15 +0800)]
bump to version 0.10

This commit is for new gbs 0.10 release branch (release-0.10).

Change-Id: Ice6b60b9974a2cbaf272a3a491dab3e1b4f24a20

12 years agoUpdate chroot module
Zhang Qiang [Wed, 19 Sep 2012 09:03:53 +0000 (17:03 +0800)]
Update chroot module

As depanneur is used to create build, and multiple build root will
be created if --threads=<> specified, so we remove -A option.
The build root should be specified while using gbs chroot, just as
chroot command.

Change-Id: I014e441f2ff206002595bd3acf54ff749ffcf353

12 years agoUse build-experimental to replace build module
Zhang Qiang [Wed, 19 Sep 2012 02:19:08 +0000 (10:19 +0800)]
Use build-experimental to replace build module

We have tested new new build module 'build-experimental' for several
circles, and its compartiable with build module, no any regression
issue, so let's use this module to replace current build module.

Change-Id: I58ea77cb86f21d32a5819bb0213291e407f810e5

12 years agouse 'warning' instead of 'warn'
Zhang Qiang [Tue, 18 Sep 2012 01:41:57 +0000 (09:41 +0800)]
use 'warning' instead of 'warn'

Change-Id: I0b60aa144acffac2b2b16765a6e63a9724add6a8

12 years agoshow local repo dir with correct disto and show build root dir
Zhang Qiang [Mon, 17 Sep 2012 08:02:18 +0000 (16:02 +0800)]
show local repo dir with correct disto and show build root dir

* show correct local repo dir: for different ditros(tizen, tizen2.0,
ect) different local repos are generated.
* show build root dirs, user can see this info and chroot it easily.

Change-Id: Ib8c071da842d1194c05499a605cb76718ef894a3

12 years agoMerge "Add a default parser in ConfigMgr" into devel
Qiang Z Zhang [Tue, 18 Sep 2012 02:30:23 +0000 (19:30 -0700)]
Merge "Add a default parser in ConfigMgr" into devel

12 years agoAdd a default parser in ConfigMgr
Huang Hao [Mon, 17 Sep 2012 07:23:12 +0000 (15:23 +0800)]
Add a default parser in ConfigMgr

- Fix bug#333.
- Change config item like %(xxx)s to ${xxx} in DEFAULTS
    dict, otherwise InterpolationError will be raised
- Transform ${upstream_tag} back to %(upstream_tag)s before
    calling gbp, which does not change functionality of gbp

Change-Id: I3ba122ef4a633c23d59e136773ae98d1e280dab3

12 years agoMerge "Display meaningful info when parsing repo urls" into devel
Qiang Z Zhang [Tue, 18 Sep 2012 02:29:40 +0000 (19:29 -0700)]
Merge "Display meaningful info when parsing repo urls" into devel

12 years agoDisplay meaningful info when parsing repo urls
Huang Hao [Mon, 17 Sep 2012 09:15:08 +0000 (17:15 +0800)]
Display meaningful info when parsing repo urls

Fix bug#340

Change-Id: I786bb6a3f622eca1e6087cab3fc0f2a3eaa214ea

12 years agoAdd more description about gbs build-experimental help info fix#350
Zhang Qiang [Mon, 17 Sep 2012 06:53:09 +0000 (14:53 +0800)]
Add more description about gbs build-experimental help info fix#350

Change-Id: I373ed324c16136e82a1c172092e3baefd2f37a87

12 years agoAdd --buildroot option for chroot to chroot specified dir
Zhang Qiang [Mon, 17 Sep 2012 02:15:16 +0000 (10:15 +0800)]
Add --buildroot option for chroot to chroot specified dir

Change-Id: I0d52fdec52a0e2e7f20207bd672d7f18400d0576

12 years agoUpdate packaging files
Zhang Qiang [Wed, 12 Sep 2012 13:53:50 +0000 (21:53 +0800)]
Update packaging files

* Update dependency:
  build 2012.09.12
  gbp:  0822
  depanneur: 0.1
* Update Makefile:
  dsc depend on tarball

Change-Id: I8ccdd2320b06699f37f705aea181b96673f88d5a

12 years agoCatch ConfigParser.Error when reading config
Huang Hao [Thu, 13 Sep 2012 08:11:11 +0000 (16:11 +0800)]
Catch ConfigParser.Error when reading config

Change-Id: I8ce04f7c9200ce02df62526144bf9a1dd9d13144

12 years agoChange error message showed to user.
Huang Hao [Thu, 13 Sep 2012 12:39:06 +0000 (20:39 +0800)]
Change error message showed to user.

- show user the correct message if section name specified by
    general.profile does not exist
- remove default value of remotebuild.build_server in code. if
    there is no [remotebuild] section in config file, gbs rb will
    do remote build with tizen.org. It's wried to user.
- complain no obs api found when running gbs rb, do not complain
    when parsing config file.

Change-Id: I7766a7ee04eec3e992e450aa26d0263ee45311fe

12 years agoconf: fix bug in config template generation
Markus Lehtonen [Thu, 13 Sep 2012 05:41:06 +0000 (08:41 +0300)]
conf: fix bug in config template generation

Use shutil.move() instead of os.rename() which fails if the template
file would be renamed over file system boundaries.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoSupport squashing patches in patch generation
Markus Lehtonen [Mon, 20 Aug 2012 14:23:26 +0000 (17:23 +0300)]
Support squashing patches in patch generation

Add new command line and config file option to squash commits in patch
generation into a one monolithic diff. One usage example could be e.g.
in linux kernel to squash commits between base version and stable branch
head into one .diff.

This patch directly facilitates git-buildpackage and just passes the new
option to it.

Command line option takes preference over the config file.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agofirst version of localbuild integrated with depanneur
Zhang Qiang [Wed, 5 Sep 2012 04:22:21 +0000 (12:22 +0800)]
first version of localbuild integrated with depanneur

Available features:
* multiple packages build
* parallel build with multiple threads
* dependency build automaticlly
* local repo generated

Already implemented depanneur options:
* --clean, --clean-once, --overwrite
* --incremental, --keepgoing, --no-configure
* --exclude, --exclude-from-file
* --thread
* --binary-list
* --debug

Usage Example:
$ mkdir tizen-packages
$ cp package1 package2 package3 ... tizen-packages/
$ gbs localbuild -A ia32 tizen-packages # build all packages under tizen-packages
$ cd tizen-packages/
$ gbs localbuild -A ia32 # build all packages under current dir
$ gbs localbuild -A ia32 --overwrite --include-all
$ gbs localbuild -A i586 --threads=2
$ gbs localbuild -A i586 --threads=2 --exclude=dlog --exclude=eglibc
$ gbs localbuild -A i586 --threads=4 --binary-list=/path/to/pkgs.list
$ cd package1/
$ gbs localbuild -A i586 --incremental # only support build one package

Change-Id: I8e214601cc3021c33c8a95b00477bd18546e05c3

12 years agoMerge "More changes to support profile style of config." into devel
Qiang Z Zhang [Thu, 13 Sep 2012 02:39:15 +0000 (19:39 -0700)]
Merge "More changes to support profile style of config." into devel

12 years agoMore changes to support profile style of config.
Huang Hao [Tue, 11 Sep 2012 10:48:47 +0000 (18:48 +0800)]
More changes to support profile style of config.

- proflie section header should start with "proflie_", obs
    section header should start with "obs_", repo section
    header should start with "repo_".
- add base_prj and target_prj config to obs section
- generate profile style of config file in ~/.gbs.conf if no
    config file were found
- clean all parsers in function reset_from_conf()
- as described in issue#255, remove config file in cwd
- if current config is subcommand oriented style, convert it to
    profile oriented style into ~/.gbs.conf.template. Leave it
    original config file unchange.
- BrainConfigParser.set() is not compatible with super set, so
    change name to set_into_file()
- add class RepoConf and OBSConf to repo section info and obs
    section info, including section name which is useful for
    auto new style config generation.
- only update gbs.conf that we had changed and catch permission
    exception.
- add /etc/gbs.conf back.

Change-Id: I1dcee2814a7d5430ac3329a2c018e98b48734569

12 years agoHide "man" subcommand which was introduced by osc.cmdln.
Huang Hao [Wed, 12 Sep 2012 03:31:51 +0000 (11:31 +0800)]
Hide "man" subcommand which was introduced by osc.cmdln.

osc.cmdln add do_man() and hide() to cmdln.1.0.0. do_man() is a
subcommand to generate man page. hide() is a decorator to hide
subcommand in help message, but user can still use it.

Change-Id: I2f4167211397698b8f84635347cfdb2f7c4e3b3c

12 years agoUse GBS temp dir for GBP, too
Markus Lehtonen [Tue, 11 Sep 2012 08:59:23 +0000 (11:59 +0300)]
Use GBS temp dir for GBP, too

Fixes #332.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoFix typo in gbp error message
Markus Lehtonen [Tue, 11 Sep 2012 09:01:32 +0000 (12:01 +0300)]
Fix typo in gbp error message

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoMerge "Little refactor and add test cases to conf.py" into devel experimental
Qiang Z Zhang [Mon, 10 Sep 2012 09:05:59 +0000 (02:05 -0700)]
Merge "Little refactor and add test cases to conf.py" into devel

12 years agoFix minor bugs
Huang Hao [Mon, 10 Sep 2012 08:05:35 +0000 (16:05 +0800)]
Fix minor bugs

- catch ValueError for url given by --repository
- prompt user if can't find obs api
- use empty password if no passwd item found for obs

Change-Id: I5c8942619cf11a019b1964c235c7f90edb78a8ee

12 years agoLittle refactor and add test cases to conf.py
Huang Hao [Fri, 7 Sep 2012 12:06:08 +0000 (20:06 +0800)]
Little refactor and add test cases to conf.py

- change BrainConfigParser.read() to read_one() since the code only
    use this function to read one config file. It's simpler.
- remove BrainConfigParser.check_opt() since no code use it.
- remove else branch in ConfigMgr.get() since the code can still
    work if val is empty string. Also add a test case for it.
- remove ConfigMgr.set() since no code use it. passwdx set back
    in _check_passwd(), and we will not use this set() function to
    add option into config file.
- change implementation of Fixture class, it doesn't call start()
    and stop() methods which introduced by mock0.7
- add more test cases for conf.py

Change-Id: I598f8943f98f067aa584fa4be811492c70226f23

12 years agorename conf as correct tizen release name
Zhang Qiang [Sun, 9 Sep 2012 22:52:18 +0000 (06:52 +0800)]
rename conf as correct tizen release name

This renameing phrase is needed by depanneur

Change-Id: I9cf110fcce94911ed0de2e2bac360c0e7f80737a

12 years agoSupport profile oriented style of config.
Huang Hao [Fri, 7 Sep 2012 07:47:18 +0000 (15:47 +0800)]
Support profile oriented style of config.

- support profile oriented style. It is compatible with subcommand
    oriented style.
- add a class Profile to store url/user/password of repos and api.
- add a class BizConfigManager extending from ConfigMgr. It
    handles profile info and does not care about multi-levels and
    passwdx issues. It returns current profile instance even
    config file has subcommand oriented style.
- make two functions decode_passwdx, encode_passwd to convert
    between passwd and passwdx.
- move get_repos_conf() from cmd_build.py to conf.py and split it
    into two parts
    _parse_build_repos() and _build_profile_by_subcommand()
- add test cases in test_profile.py

Change-Id: I81b2906456766f1061ccef9e7d51fea794c59409

12 years agoSupport ini section header like [section "name"].
Huang Hao [Fri, 7 Sep 2012 05:11:07 +0000 (13:11 +0800)]
Support ini section header like [section "name"].

Add a class SectionPattern to support section header style like
[section "name"]. It's also compatible with style like [section].

Change-Id: I6c35eb00a2f3be912cee34f421173fb0523aa191

12 years agoAdd upstream-branch and upstream-tag options
Markus Lehtonen [Fri, 17 Aug 2012 13:58:10 +0000 (16:58 +0300)]
Add upstream-branch and upstream-tag options

Add config file and command line options to specify the upstream branch
name and upstream tag format for build, export and remotebuild commands.
This is needed in order to be able to support different maintenance
models of non-native packages (with patch-generation enabled):
1. If upstream sources are imported with GBS, these options are not
   needed
2. However, if maintainer uses upstream git tree directly, he needs to
   be able to specify the tag format - otherwise gbp is unable to
   create orig source archive or generate patches

Command line option takes preference over the config file.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoEnable patch-generation
Markus Lehtonen [Fri, 17 Aug 2012 10:03:55 +0000 (13:03 +0300)]
Enable patch-generation

This commit enables the "proper" maintenance model of packages. That is,
create a real upstream source archive (matching the upstream tag) and
patches on top of that. It facilitates the patch compression support in
git-buildpackage: patches bigger that 100kB are compressed with gzip.
GBP also modifies the spec file to contain the new list of patches.

GBS enables this mode if the git tree has 'upstream' branch. It tries to
checkout the orig tarball with pristine-tar, if 'pristine-tar'
branch is found. If this fails, it tries to create the orig tarball from
a git tag corresponding the upstream version.

GBS falls back to the old method of generating one monolithic tarball if
exporting of packaging files (i.e. upstream archive and patch
generation) in this new mode fails.

NOTE: .spec file autoupdate feature is limited and might not work with
more exotic packaging. E.g. patches inside conditionals are not
supported, at the moment.

TODO: Currently, also packaging-only commits generate patches which is
only noise from source code perspective. This needs to be fixed in
git-buildpackage.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agouse iter var 'i' to replace repo, which already has been used
Zhang Qiang [Fri, 7 Sep 2012 05:49:48 +0000 (13:49 +0800)]
use iter var 'i' to replace repo, which already has been used

Change-Id: Ia7a05fade7ef7271888008f3d8c4f1357288c07f

12 years agofix undefined var backtrace issue.
Zhang Qiang [Fri, 7 Sep 2012 05:12:45 +0000 (13:12 +0800)]
fix undefined var backtrace issue.

Change-Id: I5d29c49a5f70e8fed1911992d0d4bae3095c96eb

12 years agocall build with --clean if target build root in not-ready stat.
Zhang Qiang [Fri, 7 Sep 2012 04:56:28 +0000 (12:56 +0800)]
call build with --clean if target build root in not-ready stat.

Change-Id: I693e2c42331773f445a5a173e882403f77a72f8d

12 years agofix reference undefined var backtrace issue
Zhang Qiang [Fri, 7 Sep 2012 04:40:59 +0000 (12:40 +0800)]
fix reference undefined var backtrace issue

Change-Id: I3509afc223c211449ddee62a9482d7cc955b0a34

12 years agoMove gbp argument creation into one function
Markus Lehtonen [Thu, 6 Sep 2012 10:43:37 +0000 (13:43 +0300)]
Move gbp argument creation into one function

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoMerge "Fix KeyError in ConfigMgr._get" into devel
Qiang Z Zhang [Fri, 7 Sep 2012 03:04:09 +0000 (20:04 -0700)]
Merge "Fix KeyError in ConfigMgr._get" into devel

12 years agoFix KeyError in ConfigMgr._get
Huang Hao [Fri, 7 Sep 2012 02:32:49 +0000 (10:32 +0800)]
Fix KeyError in ConfigMgr._get

In function ConfigMrg._get() if NoOptionError occurs and section
name is not in self.DEFAULTS, KeyError will be raised.

Change-Id: Iaa08c032eae45b1cc95294a4c7975d0aedb10405

12 years agoMerge "Add tests for getting config value." into devel
Qiang Z Zhang [Fri, 7 Sep 2012 02:36:33 +0000 (19:36 -0700)]
Merge "Add tests for getting config value." into devel

12 years agoAdd tests for getting config value.
Huang Hao [Thu, 6 Sep 2012 12:59:53 +0000 (20:59 +0800)]
Add tests for getting config value.

Fixture object can setup the 3 levels of different mocking config
files which locate in tests/testdata/ini/.

Change-Id: I079498ca086f3435916467adbfa94c3fa0809565

12 years agocmd_build: Implemented output repository creation.
Ed Bartosh [Mon, 3 Sep 2012 11:28:04 +0000 (14:28 +0300)]
cmd_build: Implemented output repository creation.

When -o commandline option is used packages are copied to specified
output directory and now createrepo is called to create rpm repo out
of that directory.

Fixes: #74, #201

Change-Id: Ie06536fe367509bbd38088b4d6120da5436b7542

12 years agoChange tab to spaces
Huang Hao [Thu, 6 Sep 2012 07:47:42 +0000 (15:47 +0800)]
Change tab to spaces

Change-Id: I1b939a7f2cfe1644eaa6df8b7cba860b075f154e

12 years agoCode cleanup.
Ed Bartosh [Thu, 30 Aug 2012 11:33:18 +0000 (14:33 +0300)]
Code cleanup.

A bit of pylinting. Also runner/embed function has been removed as
it's not used in gbs.

Change-Id: I25f19ccc17811759db2ebeaa29f16e0f52ffba19

12 years agoGet rid of unused build_root config parameter
Zhang Qiang [Wed, 5 Sep 2012 07:23:37 +0000 (15:23 +0800)]
Get rid of unused build_root config parameter

It's not used anywhere in the code, so let's remove it.
Fixes #293

Change-Id: I15d18f64ae6f3aef2481773acabeee50253a6323

12 years agoMerge "Introduced base_prj and target_prj config parameters." into devel
Qiang Z Zhang [Wed, 5 Sep 2012 08:19:48 +0000 (01:19 -0700)]
Merge "Introduced base_prj and target_prj config parameters." into devel

12 years agoMerge "Used username as part of temporary directory." into devel
Qiang Z Zhang [Wed, 5 Sep 2012 05:04:32 +0000 (22:04 -0700)]
Merge "Used username as part of temporary directory." into devel

12 years agoIntroduced base_prj and target_prj config parameters.
Ed Bartosh [Mon, 3 Sep 2012 13:36:48 +0000 (16:36 +0300)]
Introduced base_prj and target_prj config parameters.

Saves a lot of typing in command line.
Fixes #242

Change-Id: Ie2b057bee031d18d89816123078826b17eed71fb

12 years agoUsed username as part of temporary directory.
Ed Bartosh [Thu, 30 Aug 2012 08:29:21 +0000 (11:29 +0300)]
Used username as part of temporary directory.

Temporary directory is used as a base path for buildroot, cachedir and
others temporary directories. Making it to contain username solves
conflicts when gbs is run by more than one user on the same machine at
the same time.

Fixes: #283, #278, #244

Change-Id: Iafb9f83691e945d7148ef70f059096dada2cc701

12 years agoCheck build.xml format and warn user if build.conf does not exist
Huang Hao [Wed, 29 Aug 2012 08:05:38 +0000 (16:05 +0800)]
Check build.xml format and warn user if build.conf does not exist

Fix Bug #284. Method SafeURL.urljoin is useless now, so remove it.

Change-Id: I09cb7d6046e3acd3388bb482c8aa2ddef75da0d5

12 years agoAdd class SafeURL to hide user/passwd info in url string.
Huang Hao [Mon, 27 Aug 2012 12:47:24 +0000 (20:47 +0800)]
Add class SafeURL to hide user/passwd info in url string.

Try to fix bug#233, gerrit#894 is a hotfix for this issue in v0.9.
Create SafeURL object from repoN.url/user/passwd in config file,
this safe url is a string object, can be directly print to console.
When pass to build script, use its property "full" with user/passwd
info.

Change-Id: I667989e61a26a00a54255dd7c859e46553814f8f

12 years agoMerge "Used current user's name instead of config option." into devel
Qiang Z Zhang [Thu, 30 Aug 2012 00:24:22 +0000 (17:24 -0700)]
Merge "Used current user's name instead of config option." into devel

12 years agoMerge "Used shorter import." into devel
Qiang Z Zhang [Thu, 30 Aug 2012 00:15:51 +0000 (17:15 -0700)]
Merge "Used shorter import." into devel

12 years agoUsed current user's name instead of config option.
Ed Bartosh [Tue, 28 Aug 2012 11:46:13 +0000 (14:46 +0300)]
Used current user's name instead of config option.

In cmd_build user name from [remotebuild] section of configuration file
was used as a part of temporary directory name. This approach is confusing
(why anything from remotebuild is used in build mode?) and it also caused
gbs crash when the same name is mentioned in [remotebuild] section for
different local users.

Fixes #283

Change-Id: Ie789564811aa0a9271962d7584421592c215ef7d

12 years agoMerge "Workarounded osc bug by retrying to call it 3 times." into devel
Qiang Z Zhang [Tue, 28 Aug 2012 14:30:06 +0000 (07:30 -0700)]
Merge "Workarounded osc bug by retrying to call it 3 times." into devel

12 years agoMerge "Use ctrl-c to interrupt pycurl downloading" into devel
Qiang Z Zhang [Tue, 28 Aug 2012 14:05:40 +0000 (07:05 -0700)]
Merge "Use ctrl-c to interrupt pycurl downloading" into devel

12 years agoUsed shorter import.
Ed Bartosh [Thu, 23 Aug 2012 14:48:58 +0000 (17:48 +0300)]
Used shorter import.

Using ObsError instead of using errors.ObsError. Makes lines
shorter. Eliminates several pylint complains.

Change-Id: Ib7e9e58cbfcd6553f91b147a83688666a0467003

12 years agoWorkarounded osc bug by retrying to call it 3 times.
Ed Bartosh [Thu, 23 Aug 2012 14:29:42 +0000 (17:29 +0300)]
Workarounded osc bug by retrying to call it 3 times.

Sometimes core.http_GET returns empty responce, which leeds to
core.ET.ParseError: no element found: line 1, column 0. Trying to send
request again solves the problem in most of the cases.

Fixes #252

Change-Id: I9b418393110464abf2f698136fe36e4c3dddfba3

12 years agoEnable reading multiple config files (#27)
Markus Lehtonen [Fri, 17 Aug 2012 12:55:44 +0000 (15:55 +0300)]
Enable reading multiple config files (#27)

When updating an existing key, it is set in the config file that it was
read from.

When adding a new key, it is added to the "highest priority" config file
that has the desired section.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoUse ctrl-c to interrupt pycurl downloading
Huang Hao [Mon, 27 Aug 2012 08:28:33 +0000 (16:28 +0800)]
Use ctrl-c to interrupt pycurl downloading

pycurl.perform() blocks ctrl-c. If forget to set proxy, we have to
wait 30 seconds till connecting timeout.

Change-Id: I7f22fc110221afd08c1fe01b545a14a0d518e9d5

12 years agoconf: don't use '/etc/gbs.conf'
Markus Lehtonen [Mon, 27 Aug 2012 07:58:56 +0000 (10:58 +0300)]
conf: don't use '/etc/gbs.conf'

Drop the usage of the system level config file.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoBig overhaul of BrainConfigParser class
Markus Lehtonen [Thu, 23 Aug 2012 09:02:16 +0000 (12:02 +0300)]
Big overhaul of BrainConfigParser class

Fixes problems in setting options in the BrainConfigParser class.
Previously, linenumber pointers would get out-of-sync when
updating/inserting/replacing new options with the set() method. Now we
always parse the actual file contents when running set(), thus we never
get out-of-sync.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoMerge "Fix replacing of keys in config manager" into devel
Qiang Z Zhang [Mon, 27 Aug 2012 06:30:34 +0000 (23:30 -0700)]
Merge "Fix replacing of keys in config manager" into devel

12 years agoMerge "Fix some small problems in RepoParser" into devel
Qiang Z Zhang [Mon, 27 Aug 2012 06:11:05 +0000 (23:11 -0700)]
Merge "Fix some small problems in RepoParser" into devel

12 years agoGet rid of local copy of cmdln.py
Ed Bartosh [Wed, 1 Aug 2012 11:55:15 +0000 (14:55 +0300)]
Get rid of local copy of cmdln.py

In the current code thereis a copy of cmdln.py module, which is also
present in osc. gbs depends on osc, so it's better to just use cmldn
from there to avoid unneeded code duplication.

Change-Id: Ib3301ad1635ac681e7b7213aafa17bed0ac22c0a

12 years agoFix replacing of keys in config manager
Markus Lehtonen [Wed, 22 Aug 2012 10:07:34 +0000 (13:07 +0300)]
Fix replacing of keys in config manager

Otherwise cmd_build will crash if 'passwd' are being replaced with
'passwdx'.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoFix some small problems in RepoParser
Huang Hao [Fri, 24 Aug 2012 05:31:41 +0000 (13:31 +0800)]
Fix some small problems in RepoParser

RepoParser.parse() is a bit of hard for understanding. try to make
it more cleaner and readable.

 - remove useless self.archs
 - split local path out first, otherwise urlgrab will complain
    "<url> malformed" for local path
 - get_repos_by_arch() should return local+standard repos at least
 - check self.buildconf each time before getting repo's build.conf
 - self.repos is used only in one place in self.parse(), it can
    be a local var and passed by argument
 - build meta of one repo should not be used for another repo, so
    self.buildmeta can also be a local var in for loop
 - add a function is_standard_repo() to check repomd.xml file
 - add a function fetch() to fetch a remote file into self.cachedir

Change-Id: I1d5d8f9347a5426a323aa04e7edf8c5e75c1c65a

12 years agoMerge "Use pycurl Keep-Alive feature to save download time." into devel
Qiang Z Zhang [Thu, 23 Aug 2012 11:17:43 +0000 (04:17 -0700)]
Merge "Use pycurl Keep-Alive feature to save download time." into devel

12 years agoUse pycurl Keep-Alive feature to save download time.
Huang Hao [Mon, 20 Aug 2012 11:45:38 +0000 (19:45 +0800)]
Use pycurl Keep-Alive feature to save download time.

When GBS parse "latest" type of repo url, it tries to download
several URLs. This usually costs about 30 seconds to complete. By
using keepalive it takes about 10 seconds. pycurl print "Re-using
existing connection!" if pycurl.VERBOSE set to 1.

Change-Id: Ib78b204c26d9077c15e0ea7ff7b032ad2314546f

12 years agoMerge "Raise OSCError in oscapi.py::OSC::core_http instead of ObsError." into devel
Qiang Z Zhang [Thu, 23 Aug 2012 08:26:37 +0000 (01:26 -0700)]
Merge "Raise OSCError in oscapi.py::OSC::core_http instead of ObsError." into devel

12 years agoImplemented testcases for gbs changelog.
Ed Bartosh [Wed, 22 Aug 2012 14:58:47 +0000 (17:58 +0300)]
Implemented testcases for gbs changelog.

Change-Id: Ie2909f33a443e888ce29be5f2dfde0847b291fe2

12 years agoRenamed tests.
Ed Bartosh [Wed, 22 Aug 2012 14:51:38 +0000 (17:51 +0300)]
Renamed tests.

Removed useless numbers from the test names.

Change-Id: If9e85446958f02a4669b647c0a94902a012144cd

12 years agocmd_changelog: Removed not working check.
Ed Bartosh [Wed, 22 Aug 2012 14:12:00 +0000 (17:12 +0300)]
cmd_changelog: Removed not working check.

repo.is_clean returns tuple, so if not repo.is_clean() always False,
which makes this check useless. I prefer to remove it instead of
fixing because if I fix it it will start complaining each time git
repo has untracked files and users may not like it.

Change-Id: I5dc6a53e01d5f80aef6ab4bc5731170c9d924834

12 years agoRaise OSCError in oscapi.py::OSC::core_http instead of ObsError.
Huang Hao [Tue, 21 Aug 2012 13:11:39 +0000 (21:11 +0800)]
Raise OSCError in oscapi.py::OSC::core_http instead of ObsError.

Error message print out to console is incomplete since ObsError
can't be catched by methods in oscapi.py and throw directly to
cmd_remotebuild.py.

Change-Id: I2879ef2ab7f60f3f0caa35b081c9408ac6589527

12 years agoget specified commit info
Guan Junchun [Tue, 21 Aug 2012 09:18:51 +0000 (17:18 +0800)]
get specified commit info

1. gbs rb -c HEAD~1 should get 'HEAD~1' commit info
2. gbs rb [--include-all] get 'HEAD' commit info

12 years agoMerge "fix undefined issue introduced by merging code" into devel
Zhang Qiang [Thu, 23 Aug 2012 02:33:35 +0000 (19:33 -0700)]
Merge "fix undefined issue introduced by merging code" into devel

12 years agoFixed Ubuntu builds.
Ed Bartosh [Tue, 21 Aug 2012 11:15:11 +0000 (14:15 +0300)]
Fixed Ubuntu builds.

One more try to fix OTC Tester build.
Please, don't merge this change until there will be 'Build Successful'
message from OTC Tester for this change.

PS: We need to do something with our release process. It's already
second release, which breaks tester builds and fixing is not easy.

Change-Id: Idc4f3a1f3760b28139a7f590e495efd1ee5c26c7

12 years agofix undefined issue introduced by merging code
Zhang Qiang [Tue, 21 Aug 2012 08:42:10 +0000 (16:42 +0800)]
fix undefined issue introduced by merging code

12 years agoFixed Ubuntu builds in OTC Tools Tester - gbs.
Ed Bartosh [Tue, 21 Aug 2012 08:19:09 +0000 (11:19 +0300)]
Fixed Ubuntu builds in OTC Tools Tester - gbs.

For every gbs release gbs.spec and gbs.dsc should be updated.
Unfortunately gbs.dsc is still not used in gbs release process and
maintainer forgets to update it. This leads to the breakage of the
continuous integration tests (OTC Tools Tester - gbs job).

Change-Id: Ifccd785d0bbe2797ddd593c760b590c74e0623f8

12 years agofix merge conflict issue from release-0.9 branch to devel
Zhang Qiang [Mon, 20 Aug 2012 14:06:47 +0000 (22:06 +0800)]
fix merge conflict issue from release-0.9 branch to devel

12 years agobump to version 0.9 release-0.9 0.9
Zhang Qiang [Tue, 14 Aug 2012 22:48:59 +0000 (06:48 +0800)]
bump to version 0.9

12 years agoalways raise errors.ObsError in oscapi module instead of OSCError
Zhang Qiang [Mon, 20 Aug 2012 08:30:55 +0000 (16:30 +0800)]
always raise errors.ObsError in oscapi module instead of OSCError

OSCError can't be catched and backtrace would be printed.

12 years agoconvert config data as string while putting to OBS
Zhang Qiang [Mon, 20 Aug 2012 07:28:41 +0000 (15:28 +0800)]
convert config data as string while putting to OBS

This will cause exception/backtrace with some system. fix #240

12 years agoMerge changes I4d66326a,I0d8c7379 into devel
Qiang Z Zhang [Sun, 19 Aug 2012 01:13:48 +0000 (18:13 -0700)]
Merge changes I4d66326a,I0d8c7379 into devel

* changes:
  Fixed tests for gbs help.
  Implemented testcases for gbs import.

12 years agoFix incorrect gbp command line options in export and remotebuild
Zhang Qiang [Sat, 18 Aug 2012 23:59:40 +0000 (07:59 +0800)]
Fix incorrect gbp command line options in export and remotebuild

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
12 years agoPylining
Ed Bartosh [Tue, 14 Aug 2012 10:09:40 +0000 (13:09 +0300)]
Pylining

Change-Id: Ia3d0b4f28f6863207d4de398131bde712093f8fa

12 years agounify the help info to use lower char
Zhang Qiang [Fri, 17 Aug 2012 02:29:30 +0000 (10:29 +0800)]
unify the help info to use lower char

12 years agoremove --debuginfo and --incremental
Huang Hao [Thu, 16 Aug 2012 09:37:03 +0000 (17:37 +0800)]
remove --debuginfo and --incremental

--debuginfo useless not so remove it, we will have new design version
of incremental build

12 years agoMerge "support multiple repos from gbs.conf and command line opts" into release-0.9
Zhang Qiang [Thu, 16 Aug 2012 10:31:14 +0000 (03:31 -0700)]
Merge "support multiple repos from gbs.conf and command line opts" into release-0.9

12 years agoFixed tests for gbs help.
Ed Bartosh [Wed, 15 Aug 2012 15:23:52 +0000 (18:23 +0300)]
Fixed tests for gbs help.

Tests were running gbs help with os.system, which means that in order
to pass tests gbs have to be installed. This doesn't make much sense
for developer-level tests. They should be able to run from source tree
without any preparations.

Change-Id: I4d66326ad26564f2e253d2141284b475a0d4995e

12 years agoImplemented testcases for gbs import.
Ed Bartosh [Thu, 9 Aug 2012 15:40:22 +0000 (18:40 +0300)]
Implemented testcases for gbs import.

This is a first real set of testcases for the gbs module. Testcases were
taken from gbs-auto-test project (Thanks, guys!) and integrated into
existing continuous integration infrastructure. Some new testcase have
been added to increase test coverage.

Change-Id: I0d8c7379d1d87919d1b9f2863480e1a6451793f7

12 years agoUsed absolute imports.
Ed Bartosh [Fri, 3 Aug 2012 14:39:05 +0000 (17:39 +0300)]
Used absolute imports.

PEP0008 discourages relative imports in quite strict manner:
Relative imports for intra-package imports are highly
discouraged. Always use the absolute package path for all imports.
So, let's not have them.

Change-Id: I7622060910bf0f62ebc55c2777b3b14159e8a7e7

12 years agoraise error if base obs project is not exists
Zhang Qiang [Wed, 15 Aug 2012 05:16:21 +0000 (13:16 +0800)]
raise error if base obs project is not exists

12 years agosupport multiple repos from gbs.conf and command line opts
Zhang Qiang [Wed, 15 Aug 2012 02:46:04 +0000 (10:46 +0800)]
support multiple repos from gbs.conf and command line opts

RepoParser class should parse all repos and generate standard repos
and composite repos.

12 years agoUse hostport instead of hostname.
Huang Hao [Wed, 15 Aug 2012 02:28:10 +0000 (10:28 +0800)]
Use hostport instead of hostname.

Include port in urls returns by get_repos_conf(). Fix issue#234

12 years agochange failed to get build conf msg as warning
Zhang Qiang [Tue, 14 Aug 2012 22:31:04 +0000 (06:31 +0800)]
change failed to get build conf msg as warning