tags 606278 + patch fixed-upstream
thanks

On Wed, Dec 08, 2010 at 10:28:55AM +0000, Roger Leigh wrote:
> On Wed, Dec 08, 2010 at 03:08:09AM +0200, Modestas Vainius wrote:
> > Hello,
> > 
> > On trečiadienis 08 Gruodis 2010 02:47:14 Modestas Vainius wrote:
> > > I guess now it wants a key. I spotted `sbuild-update --keygen` in the
> > > changelog and used it. Now it went much further but failed to pick up
> > > required build-deps from experimental (attached). Please note that sbuild
> > > 0.60.5 was fine with this phonon-backend-vlc dsc (get it from incoming).

The attached patch should fix the main errors.  I'll check the key
generation next.

-- 
  .''`.  Roger Leigh
 : :' :  Debian GNU/Linux             http://people.debian.org/~rleigh/
 `. `'   Printing on GNU/Linux?       http://gutenprint.sourceforge.net/
   `-    GPG Public Key: 0x25BFB848   Please GPG sign your mail.
From e08ee38ecae658927b90da3bdb44e78759c4d99d Mon Sep 17 00:00:00 2001
From: Roger Leigh <[email protected]>
Date: Wed, 8 Dec 2010 10:56:52 +0000
Subject: [PATCH] Sbuild::ResolverBase: Dummy package creation is inside the chroot filesystem

---
 lib/Sbuild/ResolverBase.pm |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Sbuild/ResolverBase.pm b/lib/Sbuild/ResolverBase.pm
index 7c69608..cdcde31 100644
--- a/lib/Sbuild/ResolverBase.pm
+++ b/lib/Sbuild/ResolverBase.pm
@@ -449,7 +449,9 @@ sub setup_apt_archive {
     #Prepare a path to build a dummy package containing our deps:
     if (! defined $self->get('Dummy package path')) {
         $self->set('Dummy package path',
-		   tempdir('resolver' . '-XXXXXX', TMPDIR => 1));
+
+		   tempdir('resolver' . '-XXXXXX',
+			   DIR => $session->get('Location') . "/tmp"));
     }
     my $dummy_dir = $self->get('Dummy package path');
     my $dummy_archive_dir = $dummy_dir . '/apt_archive';
@@ -472,7 +474,7 @@ sub setup_apt_archive {
         return 0;
     }
 
-    my $dummy_pkg_dir = $self->get('Dummy package path') . '/' . $dummy_pkg_name;
+    my $dummy_pkg_dir = $dummy_dir . '/' . $dummy_pkg_name;
     my $dummy_deb = $dummy_archive_dir . '/' . $dummy_pkg_name . '.deb';
     my $dummy_dsc = $dummy_archive_dir . '/' . $dummy_pkg_name . '.dsc';
 
@@ -631,13 +633,13 @@ EOF
 
     # Write a list file for the dummy archive if one not create yet.
     if (! -f $dummy_archive_list_file) {
-        my ($tmpfh, $tmpfilename) = tempfile();
+        my ($tmpfh, $tmpfilename) = tempfile(DIR => $session->get('Location') . "/tmp");
         print $tmpfh 'deb file://' . $session->strip_chroot_path($dummy_archive_dir) . " ./\n";
         print $tmpfh 'deb-src file://' . $session->strip_chroot_path($dummy_archive_dir) . " ./\n";
         close($tmpfh);
         # List file needs to be moved with root.
         $session->run_command(
-            { COMMAND => ['mv', $tmpfilename,
+            { COMMAND => ['mv', $session->strip_chroot_path($tmpfilename),
                           $session->strip_chroot_path($dummy_archive_list_file)],
               USER => 'root',
               PRIORITY => 0});
-- 
1.7.2.3

Attachment: signature.asc
Description: Digital signature

Reply via email to