[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#186171: marked as done (Path to add an new option, --no-delete-source)



Your message dated Mon, 28 Jun 2004 16:32:02 -0400
with message-id <E1Bf2nK-00030P-00@newraff.debian.org>
and subject line Bug#186171: fixed in apt-src 0.25.1
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 24 Mar 2003 23:40:10 +0000
>From david@eelf.ddts.net Mon Mar 24 17:40:10 2003
Return-path: <david@eelf.ddts.net>
Received: from blackhole.oftc.net [213.70.168.208] 
	by master.debian.org with esmtp (Exim 3.12 1 (Debian))
	id 18xbY1-0006pZ-00; Mon, 24 Mar 2003 17:40:09 -0600
Received: from cpe0040f6b429d8-cm400049226055.cpe.net.cable.rogers.com
	([24.101.53.149] helo=willow.eelf.ddts.net ident=mail)
	by blackhole.oftc.net with esmtp (Exim 3.35 #1 (Debian))
	id 18xbXz-0007PE-00
	for <submit@bugs.debian.org>; Mon, 24 Mar 2003 23:40:08 +0000
Received: from david by willow.eelf.ddts.net with local (Exim 4.12 #1 (Debian) [+prerelease])
	id 18xbXx-0003ek-00; Mon, 24 Mar 2003 18:40:05 -0500
Date: Mon, 24 Mar 2003 18:40:05 -0500
From: David B Harris <david@eelf.ddts.net>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: Path to add an new option, --no-delete-source
Message-ID: <20030324234005.GA13839@eelf.ddts.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="RASg3xLB4tUQ4RcS"
Content-Disposition: inline
X-Reportbug-Version: 2.10.1
X-Face: +!jI>15IbOmQ\xxdkL/F"p-?6];tG@;:BK5ZD=8d^?gO-pt[$5r"W|Hlwz-gv-tMCU0H::n 2!T5}SW:j9'3bc/U:=D8O'J}Fq)3TX#<|C?S0nR<f@-DZ)3Oci>]}I?JFM{?Sf$LrJ{*Ho\:d/:Cs/ <apB}SxKL+SC~{4[d+JR!1DkR3<aU3B,?}fq<bOQ1'BQlWy5@fq+e7qrv7bv(^YT9-~7Wy?far=BNO sw\K.@tHEqw#~(QH4gutxc@?$IvJ#<;6;>kpJH:[Wmxox8JXSY#
User-Agent: Mutt/1.5.4i
Delivered-To: submit@bugs.debian.org
X-Spam-Status: No, hits=-1.6 required=4.0
	tests=PGP_SIGNATURE_2,SPAM_PHRASE_00_01,USER_AGENT,
	      USER_AGENT_MUTT
	version=2.44
X-Spam-Level: 


--RASg3xLB4tUQ4RcS
Content-Type: multipart/mixed; boundary="bg08WKrSYDhXBjb5"
Content-Disposition: inline


--bg08WKrSYDhXBjb5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Package: apt-src
Version: 0.21
Severity: normal
Tags: patch

Included is a patch which adds a new option,
-n/--no-delete-source/APT::Src:NoDeleteSource. The default is the same
as the current behaviour; that is, to remove the source tree.
Personally, I would prefer the default to *not* be to delete the source
tree, and instead have 'apt-get autoclean'-like functionality. I most
definetly don't have the skill for that though, so this is the best I
could come up with :)

There are many cases where one would not want to delete the source tree.
The two I ran into:

a) 'apt-src import kernel --location=3D/usr/src/kernel-build-2.4.20
--version=3D2.4.20-5'. linux-wlan-ng can build against this tree fine, but
it can't be removed - everything's owned by root.
b) 'apt-src import kernel
--location=3D/home/david/source/linux-2.4-xfs/linux
--version=3D2.4.20-xfs-a10'. This wasn't a problem until I wanted to build
linux-wlan-ng against the stock kernel headers tree :) I so seriously
didn't want to lose my patched-up local kernel tree ;)

Thanks :)

=2E.. now ... let's see if I attach the patch...

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux willow.eelf.ddts.net 2.4.20-xfs-a10 #1 Sun Feb 16 03:24:36 ES=
T 2003 i686
Locale: LANG=3Den_CA, LC_CTYPE=3Den_CA

Versions of packages apt-src depends on:
ii  apt                           0.5.4      Advanced front-end for dpkg
ii  dpkg-dev                      1.10.9     Package building tools for Deb=
ian
ii  libapt-pkg-perl               0.1.6      Perl interface to libapt-pkg
ii  perl                          5.8.0-17   Larry Wall's Practical Extract=
ion=20

-- no debconf information


--bg08WKrSYDhXBjb5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="apt-src-nodelete.diff"
Content-Transfer-Encoding: quoted-printable

diff -u apt-src-0.21.old/apt-src apt-src-0.21/apt-src
--- apt-src-0.21.old/apt-src	2002-12-06 23:11:15.000000000 -0500
+++ apt-src-0.21/apt-src	2003-03-24 18:32:04.000000000 -0500
@@ -182,6 +182,11 @@
 --installdebs option.
 Configuration Item: APT::Src::KeepBuilt
=20
+=3Ditem B<-n>, B<--no-delete-source>
+
+Do not delete source files when removing source package.
+Configuration Item: APT::Src:NoDeleteSource
+
 =3Ditem B<--version>
=20
 Specify a source tree version. Of use with the import command.
@@ -282,6 +287,7 @@
 	['k', 'keep-built',		'APT::Src::KeepBuilt'],
 	['q', 'quiet',			'APT::Src::Quiet'],
 	['t', 'trace',			'APT::Src::Trace'],
+	['n', 'no-delete-source',	'APT::Src::NoDeleteSource'],
 ], @ARGV);
=20
 AptSrc->config($_config);
diff -u apt-src-0.21.old/AptSrc.pm apt-src-0.21/AptSrc.pm
--- apt-src-0.21.old/AptSrc.pm	2003-02-03 13:53:45.000000000 -0500
+++ apt-src-0.21/AptSrc.pm	2003-03-24 18:29:02.000000000 -0500
@@ -466,24 +466,26 @@
         return unless $force || $this->meets_loclimit;
 =09
 	if ($this->status =3D~ /^(installed|unpacked)$/) {
-		$this->info("Removing ".$this->source." from ".$this->location." ..");
-		my @files=3D$this->basedir."/".$this->source."_".$this->version.".dsc";
-		if ($this->upstreamversion eq $this->version) {
-			# native package
-			push @files, $this->basedir."/".$this->source."_".$this->version.".tar.=
gz";
-		}
-		else {
-			# non-native
-			push @files, $this->basedir."/".$this->source."_".$this->upstreamversio=
n.".orig.tar.gz";
-			push @files, $this->basedir."/".$this->source."_".$this->version.".diff=
=2Egz";
-		}
-		foreach my $file (@files) {
-			if (-e $file && ! unlink $file) {
-				$this->error("Unable to remove $file");
+		if (!$_config->get_bool('APT::Src::NoDeleteSource')) {
+			$this->info("Removing ".$this->source." from ".$this->location." ..");
+			my @files=3D$this->basedir."/".$this->source."_".$this->version.".dsc";
+			if ($this->upstreamversion eq $this->version) {
+				# native package
+				push @files, $this->basedir."/".$this->source."_".$this->version.".tar=
=2Egz";
+			}
+			else {
+				# non-native
+				push @files, $this->basedir."/".$this->source."_".$this->upstreamversi=
on.".orig.tar.gz";
+				push @files, $this->basedir."/".$this->source."_".$this->version.".dif=
f.gz";
+			}
+			foreach my $file (@files) {
+				if (-e $file && ! unlink $file) {
+					$this->error("Unable to remove $file");
+				}
+			}
+			if ($this->do("rm", "-rf", $this->location) !=3D 0) {
+				$this->error("Unable to remove ".$this->location);
 			}
-		}
-		if ($this->do("rm", "-rf", $this->location) !=3D 0) {
-			$this->error("Unable to remove ".$this->location);
 		}
 	}
 	$this->status("removed");
diff -u apt-src-0.21.old/config apt-src-0.21/config
--- apt-src-0.21.old/config	2002-11-21 00:44:25.000000000 -0500
+++ apt-src-0.21/config	2003-03-24 18:31:54.000000000 -0500
@@ -18,6 +18,9 @@
 /* Do not delete .debs and other built files after autoinstalling them */
 //APT::Src::KeepBuilt "true";
=20
+/* Do not delete the source files when removing the package */
+//APT::Src::NoDeleteSource "false";
+
 /* Direct build logs to /dev/null unless there is an error. */
 //APT::Src::Quiet "true";
=20
Common subdirectories: apt-src-0.21.old/debian and apt-src-0.21/debian

--bg08WKrSYDhXBjb5--

--RASg3xLB4tUQ4RcS
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+f5dVuCQ/g7GxJcARAjd8AKCPFKDQPr2YxpAVL4STINLh0uWsFwCfbLBd
SJ7OEhZ0stOGy42Ly0JsnqM=
=uP6p
-----END PGP SIGNATURE-----

--RASg3xLB4tUQ4RcS--

---------------------------------------
Received: (at 186171-close) by bugs.debian.org; 28 Jun 2004 20:38:13 +0000
>From katie@ftp-master.debian.org Mon Jun 28 13:38:13 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1Bf2tJ-0000tX-00; Mon, 28 Jun 2004 13:38:13 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
	id 1Bf2nK-00030P-00; Mon, 28 Jun 2004 16:32:02 -0400
From: Laszlo Boszormenyi (GCS) <gcs@lsc.hu>
To: 186171-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#186171: fixed in apt-src 0.25.1
Message-Id: <E1Bf2nK-00030P-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Mon, 28 Jun 2004 16:32:02 -0400
Delivered-To: 186171-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 
X-CrossAssassin-Score: 2

Source: apt-src
Source-Version: 0.25.1

We believe that the bug you reported is fixed in the latest version of
apt-src, which is due to be installed in the Debian FTP archive:

apt-src_0.25.1.dsc
  to pool/main/a/apt-src/apt-src_0.25.1.dsc
apt-src_0.25.1.tar.gz
  to pool/main/a/apt-src/apt-src_0.25.1.tar.gz
apt-src_0.25.1_all.deb
  to pool/main/a/apt-src/apt-src_0.25.1_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 186171@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Laszlo Boszormenyi (GCS) <gcs@lsc.hu> (supplier of updated apt-src package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Sat, 22 May 2004 13:12:36 +0000
Source: apt-src
Binary: apt-src
Architecture: source all
Version: 0.25.1
Distribution: unstable
Urgency: low
Maintainer: Laszlo Boszormenyi (GCS) <gcs@lsc.hu>
Changed-By: Laszlo Boszormenyi (GCS) <gcs@lsc.hu>
Description: 
 apt-src    - manage Debian source packages
Closes: 183223 186171 232657 240396
Changes: 
 apt-src (0.25.1) unstable; urgency=low
 .
   * Bugfix release:
     - Install latest version of package sources (thanks to Eric Wong
       <eric@petta-tech.com>, closes: #183223).
     - Add -rfakeroot to APT::Src::BuildCommand for non root users (thanks to
       Michael Banck <mbanck@debian.org>, closes: #232657).
     - Add configuration item APT::Src::NoDeleteSource for not removing source
       files with source package (thanks to David B Harris
       <david@eelf.ddts.net>, closes: #186171).
   * New maintainer (closes: #240396).
Files: 
 31c952fb9eb0ad1a32aa09c8ddabfb54 515 admin optional apt-src_0.25.1.dsc
 180f2a5f1f97b34e2a0a952ebea87f78 19236 admin optional apt-src_0.25.1.tar.gz
 8d3cceb7d579fa550e95830d7fa6a778 29500 admin optional apt-src_0.25.1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFA4Hrc2tp5zXiKP0wRAn7HAKCDEILbxp/HzCZwVE0XNftsw0QI5ACfVizM
C5TuvahFn1VUGbExBqcRJG8=
=uZrp
-----END PGP SIGNATURE-----



Reply to: