← Back to branch summary

~ubuntu-branches/ubuntu/maverick/schroot/maverick

« back to all changes in this revision

Viewing changes to sbuild/sbuild-chroot-config.cc

  • Committer: Bazaar Package Importer
  • Author(s): Roger Leigh
  • Date: 2010-07-06 23:34:30 UTC
  • mfrom: (1.1.24 upstream) (2.2.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100706233430-0xhzqj6105yuyvb1
Tags: 1.4.7-1
http://bugs.debian.org/588247
* New upstream stable release.
* Use standards version 3.9.0.
* Correctly distribute profile conffiles (Closes: #588247).  Thanks
  to Mario Holbe.
* Update it and zh_CN translations.  Thanks to Vincenzo Campanella
  and Ji ZhengYu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sbuild/sbuild-chroot-config.cc
81
81
 init_errors + (sizeof(init_errors) / sizeof(init_errors[0])));
82
82
 
83
83
chroot_config::chroot_config ():
84
 
  chroots()
 
84
  chroots(),
 
85
  aliases()
85
86
{
86
87
}
87
88
 
88
89
chroot_config::chroot_config (std::string const& file,
89
90
                              bool               active):
90
 
  chroots()
 
91
  chroots(),
 
92
  aliases()
91
93
{
92
94
  add(file, active);
93
95
}
547
549
        chroot_facet_source_clonable::const_ptr psrc
548
550
          (chroot->get_facet<sbuild::chroot_facet_source_clonable>());
549
551
 
550
 
        if (psrc && !chroot->get_active())
 
552
        if (psrc && psrc->get_source_clone() && !chroot->get_active())
551
553
          {
552
554
            chroot::ptr source_chroot = chroot->clone_source();
553
555
            if (source_chroot)