Mercurial > treepkg > treepkg
comparison treepkg/packager.py @ 306:163f0d8b64eb
Make the svn external subdirectories configurable in the configuration
file with the per-track option svn_externals. The class attribute
svn_external_subdirs is still used if svn_externals were specified.
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Tue, 01 Dec 2009 11:42:14 +0000 |
| parents | 3781e9958eba |
| children | 5f442b0cf3a4 |
comparison
equal
deleted
inserted
replaced
| 305:3781e9958eba | 306:163f0d8b64eb |
|---|---|
| 345 version_template="%(revision)s", | 345 version_template="%(revision)s", |
| 346 pkg_revision_template="treepkg%(pkg_revision)d", | 346 pkg_revision_template="treepkg%(pkg_revision)d", |
| 347 handle_dependencies=False, signing_key_id="", do_build=True, | 347 handle_dependencies=False, signing_key_id="", do_build=True, |
| 348 rules_svn_url=None, deb_build_options="", pkg_basename="", | 348 rules_svn_url=None, deb_build_options="", pkg_basename="", |
| 349 changelog_msg_template="Update to r%(revision)s", | 349 changelog_msg_template="Update to r%(revision)s", |
| 350 svn_subset=()): | 350 svn_subset=(), svn_externals=()): |
| 351 self.name = name | 351 self.name = name |
| 352 if not pkg_basename: | 352 if not pkg_basename: |
| 353 pkg_basename = name | 353 pkg_basename = name |
| 354 self.pkg_basename = pkg_basename | 354 self.pkg_basename = pkg_basename |
| 355 self.changelog_msg_template = changelog_msg_template | 355 self.changelog_msg_template = changelog_msg_template |
| 366 self.handle_dependencies = handle_dependencies | 366 self.handle_dependencies = handle_dependencies |
| 367 self.dependencies = None | 367 self.dependencies = None |
| 368 self.pkg_dir_template = "%(revision)d-%(rules_revision)d" | 368 self.pkg_dir_template = "%(revision)d-%(rules_revision)d" |
| 369 self.pkg_dir_regex = re.compile(r"(?P<revision>[0-9]+)" | 369 self.pkg_dir_regex = re.compile(r"(?P<revision>[0-9]+)" |
| 370 r"-(?P<rules_revision>[0-9]+)$") | 370 r"-(?P<rules_revision>[0-9]+)$") |
| 371 repo = SvnRepository(svn_url, self.svn_external_subdirs, | 371 externals = svn_externals |
| 372 subset=svn_subset) | 372 if not externals: |
| 373 externals = self.svn_external_subdirs | |
| 374 repo = SvnRepository(svn_url, externals, subset=svn_subset) | |
| 373 self.working_copy = SvnWorkingCopy(repo, self.checkout_dir, | 375 self.working_copy = SvnWorkingCopy(repo, self.checkout_dir, |
| 374 logger=logging) | 376 logger=logging) |
| 375 if rules_svn_url: | 377 if rules_svn_url: |
| 376 repo = SvnRepository(rules_svn_url) | 378 repo = SvnRepository(rules_svn_url) |
| 377 self.rules_working_copy = SvnWorkingCopy(repo, self.debian_dir, | 379 self.rules_working_copy = SvnWorkingCopy(repo, self.debian_dir, |