Fixed: Avoid pbuilder warning due to missing $HOME/.pbuilderrc file (…

…pbuilder) Fixed: Make sure to start with clean APT sources.list file (pbuilder) Fixed: W: Target Packages (...) is configured multiple times in /etc/apt/sources.list (pbuilder) Fixed: Wrong deb-src in configs/ubuntu/pbuilder/pbuilderrc file (pbuilder)
i-MSCP · Jan 30, 2017 · ce67ed1 · ce67ed1
1 parent fa57573
commit ce67ed1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,12 @@
 Git 1.3.x
 ------------------------------------------------------------------------------------------------------------------------
 
+INSTALLER
+    Fixed: Avoid pbuilder warning due to missing $HOME/.pbuilderrc file (pbuilder)
+    Fixed: Make sure to start with clean APT sources.list file (pbuilder)
+    Fixed: W: Target Packages (...) is configured multiple times in /etc/apt/sources.list (pbuilder)
+    Fixed: Wrong deb-src in configs/ubuntu/pbuilder/pbuilderrc file (pbuilder)
+
 ------------------------------------------------------------------------------------------------------------------------
 1.3.16
 ------------------------------------------------------------------------------------------------------------------------

diff --git a/autoinstaller/Adapter/DebianAdapter.pm b/autoinstaller/Adapter/DebianAdapter.pm
@@ -25,6 +25,7 @@ use autouse 'iMSCP::Stepper' => qw/ startDetail endDetail step /;
 use Cwd;
 use Encode qw/ encode_utf8 /;
 use Fcntl qw/ :flock /;
+use File::HomeDir;
 use FindBin;
 use iMSCP::Debug;
 use iMSCP::Dialog;
@@ -901,9 +902,13 @@ sub _rebuildAndInstallPackage
         return 1;
     }
 
+    # Avoid pbuilder warning due to missing $HOME/.pbuilderrc file
+    my $rs = iMSCP::File->new( filename => File::HomeDir->my_home.'/.pbuilderrc' )->save();
+    return $rs if $rs;
+
     startDetail();
 
-    my $rs = step(
+    $rs = step(
         sub {
             if ($self->{'need_pbuilder_update'}) {
                 $self->{'need_pbuilder_update'} = 0;
@@ -917,7 +922,7 @@ sub _rebuildAndInstallPackage
                     '--override-config'
                 ];
                 my $stderr;
-                my $rs = executeNoWait(
+                $rs = executeNoWait(
                     $cmd,
                     (iMSCP::Getopt->noprompt && iMSCP::Getopt->verbose ? undef : sub {
                             my $lines = shift;
@@ -928,9 +933,7 @@ sub _rebuildAndInstallPackage
                     ),
                     sub { $stderr .= shift; }
                 );
-                error(
-                    sprintf( 'Could not create/update pbuilder environment: %s', $stderr || 'Unknown error' )
-                ) if $rs;
+                error(sprintf( 'Could not create/update pbuilder environment: %s', $stderr || 'Unknown error' )) if $rs;
                 return $rs if $rs;
             }
             0;
@@ -945,8 +948,7 @@ sub _rebuildAndInstallPackage
                 \ my $stderr
             );
             debug( $stdout ) if $stdout;
-            error( sprintf( 'Could not get %s Debian source package: %s', $pkgSrc,
-                    $stderr || 'Unknown error' ) ) if $rs;
+            error( sprintf( 'Could not get %s Debian source package: %s', $pkgSrc, $stderr || 'Unknown error' ) ) if $rs;
             $rs;
         },
         sprintf( 'Downloading %s %s source package...', $pkgSrc, $lsbRelease->getId( 1 ) ), 5, 2
@@ -998,11 +1000,7 @@ sub _rebuildAndInstallPackage
                 (iMSCP::Getopt->noprompt && iMSCP::Getopt->verbose ? undef : \ $stdout),
                 \ $stderr
             );
-            error(
-                sprintf(
-                    'Could not build local %s %s package: %s', $pkg, $lsbRelease->getId( 1 ), $stderr || 'Unknown error'
-                )
-            ) if $rs;
+            error(sprintf('Could not build local %s %s package: %s', $pkg, $lsbRelease->getId( 1 ), $stderr || 'Unknown error')) if $rs;
             $rs;
         },
         sprintf( 'Building local %s %s package...', $pkg, $lsbRelease->getId( 1 ) ), 5, 4
@@ -1024,12 +1022,7 @@ sub _rebuildAndInstallPackage
                 (iMSCP::Getopt->noprompt && iMSCP::Getopt->verbose ? undef : \ $stdout),
                 \ $stderr
             );
-            error(
-                sprintf(
-                    'Could not install local %s %s package: %s', $pkg, $lsbRelease->getId( 1 ),
-                    $stderr || 'Unknown error'
-                )
-            ) if $rs;
+            error(sprintf('Could not install local %s %s package: %s', $pkg, $lsbRelease->getId( 1 ), $stderr || 'Unknown error')) if $rs;
             return $rs if $rs;
 
             # Ignore exit code due to https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1258958 bug

diff --git a/configs/debian/pbuilder/pbuilderrc b/configs/debian/pbuilder/pbuilderrc
@@ -1,6 +1,6 @@
 AUTO_DEBSIGN=${AUTO_DEBSIGN:-no}
 AUTOCLEANAPTCACHE="yes"
-APTCONFDIR="/tmp/imscp_apt"
+APTCONFDIR=$(pwd)/.imscp
 #APTKEYRINGS="/usr/share/keyrings/debian-archive-keyring.gpg"
 CODENAME=$(lsb_release -cs)
 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--variant=buildd" "--keyring=/usr/share/keyrings/debian-archive-keyring.gpg")

diff --git a/configs/ubuntu/pbuilder/pbuilderrc b/configs/ubuntu/pbuilder/pbuilderrc
@@ -1,6 +1,6 @@
 AUTO_DEBSIGN=${AUTO_DEBSIGN:-no}
 AUTOCLEANAPTCACHE="yes"
-APTCONFDIR="/tmp/imscp_apt"
+APTCONFDIR=$(pwd)/.imscp
 #APTKEYRINGS=/usr/share/keyrings/ubuntu-archive-keyring.gpg
 CODENAME=$(lsb_release -cs)
 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--variant=buildd" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg")
@@ -9,12 +9,12 @@ MIRRORSITE=http://mirrors.kernel.org/ubuntu/
 HOOKDIR=""
 
 mkdir -p $APTCONFDIR
-cat >> "$APTCONFDIR/sources.list" <<EOF
+cat > "$APTCONFDIR/sources.list" <<EOF
 deb $MIRRORSITE $CODENAME main restricted universe multiverse
 deb-src $MIRRORSITE $CODENAME main restricted universe multiverse
 
 deb $MIRRORSITE ${CODENAME}-security main restricted universe multiverse
-deb-src $MIRRORSITE ${CODENAME}-updates main restricted universe multiverse
+deb-src $MIRRORSITE ${CODENAME}-security main restricted universe multiverse
 
 deb $MIRRORSITE ${CODENAME}-updates main restricted universe multiverse
 deb-src $MIRRORSITE ${CODENAME}-updates main restricted universe multiverse