Commit Graph

14 Commits

Author SHA1 Message Date
Daniel Baumann 78b10b2bd2 Merging in last bit of lb_chroot_local-packages into lb_chroot_archives (Closes: #635046). 2011-08-16 20:55:47 +02:00
Daniel Baumann fd344cdbed Correcting wrong variables in volatile handling for derivatives. 2011-08-16 08:40:27 +02:00
Daniel Baumann 557e4c365b Also guarding key additions for local configured archives to not fail if no key is supplied. 2011-08-09 13:05:29 +02:00
Daniel Baumann eedfa8e5ce Guarding archives handling with an additional check to prevent ugly message about files not existing. 2011-08-08 12:39:43 +02:00
Daniel Baumann 724f5b4dc8 Also using definition files without suffix (so that e.g. foo.list is used for both chroot and binary stage). 2011-08-08 08:10:07 +02:00
Daniel Baumann a51393f49b Reverse keywords in suffix of the archive definition files for consistency.
Previously, config/archives/foo.{binary,chroot}.{key,list} was used,
now we use config/archives/foo.{key,list}.{binary,chroot}.

That way, we're using the same single suffix for all files to make
them specific for either binary and chroot, rather than having
an exception to the rule for archive definitions.
2011-08-05 08:28:45 +02:00
Daniel Baumann ef2752faab Adding kubuntu mode in order to have different defadefault hooks enabled for ubuntu and kubuntu (needed for #630088). 2011-07-19 10:51:20 +02:00
Daniel Baumann 42cfa2bf03 Correcting wrong chroot call in chroot_archives, only affecting derivatives. 2011-06-29 07:51:41 +02:00
Daniel Baumann bfadca3225 Correct keyring packages temporary workaround to not fail when aptitude is selected (Closes: #630919). 2011-06-18 23:10:39 +02:00
Daniel Baumann b86f9c6380 Since we don't have global packages anymore, renaming lb_chroot_local-packages to lb_chroot_packages and config/chroot_local-packages to config/chroot_packages. 2011-06-15 22:08:44 +02:00
Daniel Baumann 36ecab10d3 Using .list suffix in config/archives. 2011-06-15 21:27:29 +02:00
Daniel Baumann 2312f18ef1 Changing archives key suffix from .gpg to .key. 2011-06-15 21:25:14 +02:00
Daniel Baumann a2551605c0 Unifying config/chroot_archives and config/archives, now only using config/archives.
Previously, we had config/chroot_sources (or config/chroot_archives)
that allowed local configuration for third-party repositories but we
also had config/archives (or config/repositories) that did the very
same, but also alled to use 'variables' (e.g. @DISTRIBUTION@ or
@ARCHIVE_AREAS@ to be used) that got replaces automatically.

Now, we have only config/archives that can do both. This gets rid
of the unecessary double handling of the same thing in two places.
2011-06-15 21:05:09 +02:00
Daniel Baumann 2cf5daeaef Renaming chroot_sources script to chroot_archives for consistency with debian-policy terminology. 2011-06-15 20:48:56 +02:00