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

Bug#367784: marked as done (cvs-mailcommit: diffs are not generated for files that only exist on a branch (in Attic))



Your message dated Tue, 19 May 2020 00:48:33 +0000
with message-id <E1jaqQr-0008OB-56@fasolo.debian.org>
and subject line Bug#367784: fixed in cvs-mailcommit 1.19-4
has caused the Debian Bug report #367784,
regarding cvs-mailcommit: diffs are not generated for files that only exist on a branch (in Attic)
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
367784: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=367784
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: cvs-mailcommit
Version: 1.19-2
Severity: normal
Tags: patch


Diffs are not generated for files which only exist on a branch, i.e.
stored in the Attic directory.  Because rcsdiff and co are being called
directly on the RCS files, cvs-mailcommit needs to know to look in the
Attic if the file doesn't exist in the directory specified by %p.

Christian

-- System Information:
Debian Release: 3.1
Architecture: i386 (i686)
Kernel: Linux 2.6.15-1-686-smp
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)

Versions of packages cvs-mailcommit depends on:
ii  exim4-daemon-heavy [mail-tran 4.50-8     exim MTA (v4) daemon with extended
ii  rcs                           5.7-15     The GNU Revision Control System

-- no debconf information
--- cvs-mailcommit.orig	2006-05-17 16:50:05.000000000 -0700
+++ /usr/bin/cvs-mailcommit	2006-05-17 17:51:50.000000000 -0700
@@ -262,6 +262,9 @@
 	    ($file,$oldver,$newver) = split (/,/,$cstr);
 	    next if ($oldver eq "" || $newver eq "");
 	    if ($oldver ne "NONE") {
+		if (! -f "$module_dir/$file,v" && -f "$module_dir/Attic/$file,v") {
+		    $file = "Attic/$file";	
+		}
 		# print "$rcsdiff -r$oldver -r$newver -u $module_dir/$file|\n";
 		if (open (R, "$rcsdiff -r$oldver -r$newver -u $module_dir/$file 2>/dev/null |")) {
 		    $lines = 0;
@@ -281,7 +284,7 @@
 	print  M "\n";
 	foreach $cstr (@cvs_arr) {
 	    ($file,$oldver,$newver) = split (/,/,$cstr);
-	    next if ($oldver ne "NONE" || $newver ne "1.1");
+	    next if ($oldver ne "NONE");
 
 	    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)
 		= gmtime(time);
@@ -289,6 +292,9 @@
 	    my $date = sprintf ("%4d/%02d/%02d %02d:%02d:%02d",
 				$year+1900, $mon+1, $mday, $hour,$min,$sec);
 
+	    if (! -f "$module_dir/$file,v" && -f "$module_dir/Attic/$file,v") {
+		$file = "Attic/$file";	
+	    }
 	    if (open (R, "$co -p -r$newver $module_dir/$file 2>/dev/null |")) {
 		printf M "--- %s/%s\t%s\tNONE\n", $module_dir, $file, $date;
 		printf M "+++ %s/%s\t%s\t%s\n", $module_dir, $file, $date, $newver;

--- End Message ---
--- Begin Message ---
Source: cvs-mailcommit
Source-Version: 1.19-4
Done: Junior Figueredo <juniorfg.debian@outlook.com>

We believe that the bug you reported is fixed in the latest version of
cvs-mailcommit, which is due to be installed in the Debian FTP archive.

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 367784@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Junior Figueredo <juniorfg.debian@outlook.com> (supplier of updated cvs-mailcommit 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@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Mon, 18 May 2020 20:49:48 -0300
Source: cvs-mailcommit
Architecture: source
Version: 1.19-4
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Junior Figueredo <juniorfg.debian@outlook.com>
Closes: 294253 367784 495843
Changes:
 cvs-mailcommit (1.19-4) unstable; urgency=medium
 .
   * QA upload.
   * Run wrap-and-sort.
   * debian/control:
       - Added field 'Rules-Requires-Root: binary-targets'.
       - Added the Homepage field.
       - Changed from postfix to default-mta in Depends field. Thanks to
         Andreas Henriksson. (Closes: #495843)
   * debian/copyright:
       - Migrated to 1.0 format.
       - Updated all information.
   * debian/patches:
       - 010_fix-diff-creation.patch: added to resolve incompatibility
         with Attic. Thanks to Christian G. Warden for the patch.
         (Closes: #367784)
       - 020_fix-options-manpage.patch: added to inform short options
         in manpage. Thanks to Falk Hueffner. (Closes: #294253)
   * debian/tests/control: created to perform trivial CI tests.
   * debian/upstream/metadata: created.
   * debian/watch: created.
Checksums-Sha1:
 e261fdc67415c20cdbea4b57c5ecffb8b406787d 1812 cvs-mailcommit_1.19-4.dsc
 71dab8249d1c705b719934f9cf9cb04b6babc7b9 4800 cvs-mailcommit_1.19-4.debian.tar.xz
 2516aefbc47545820aee5873bab34f0a5188820b 5083 cvs-mailcommit_1.19-4_source.buildinfo
Checksums-Sha256:
 dd00c09e35899c9c9a35bf1e7e82c503f77d4995c04c1413a9185ac62963354c 1812 cvs-mailcommit_1.19-4.dsc
 62cb68a4c518280c4d65a470ad63115a3a141983bba86e3efbe10790b99e6174 4800 cvs-mailcommit_1.19-4.debian.tar.xz
 b82e5545530e89a493f4f0b37b048ec3d2fb07052f900628f2792de5ce3812bb 5083 cvs-mailcommit_1.19-4_source.buildinfo
Files:
 c7d4c691c250d7a8f6a2100f3636d704 1812 utils optional cvs-mailcommit_1.19-4.dsc
 54b0b88bce3de2b8a6fcb564baa89ff9 4800 utils optional cvs-mailcommit_1.19-4.debian.tar.xz
 c60af0b95c0849db6d94d7c4bb2093a0 5083 utils optional cvs-mailcommit_1.19-4_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEENX3LDuyVoBrrofDS3mO5xwTr6e8FAl7DKk0ACgkQ3mO5xwTr
6e9uCw//dWUw+yrOR3AHP1Sd3RamIoVQ1bvC/hAUStnalPoHqbuJm4WBVw+YxodX
nvpgWFHkD3s9te7qe39bVaIzS5IQbk6XWuuHEmNTpeYbqSTMiuadxCpWtETFJHK1
/s/7zx5Qvkrl5sdIdclKnME41izmw/5SuepZc/RTYtwDQZoRWnW2xmv+PmH4BBCD
TUCpSGauu2lF93tst5fdTLqmT6yRC+Afj44ZddjcDcjp7+ns6HJ/crOgYvK2eCg2
ufceIUzag0t8KYWGEY+L93vEKCdCmnl5XS0jUsEndSimAEQy+lU82vHd+ShVTmzO
l30mB7z8sVHw4kk4EdDaitRzSQ0lDhWzIqVR1xzt/5LlhOPBEvgZaUv4MpoB0DVD
dG7oy4l1thfRmqTf7gBWRy3W+EfV4xBuz4xtUjMfGpdQ9sTqCM1yEPSuFA2Cy2bX
gUhMLMwiezCh4tQy6JFh8QTrQNZzvmYYH75LOxnyfNgpKTzgJQ6r6DaBCzN4l0IX
5PkTm/2tGNAk1Myrm+TZz86PiEUD2wZ7+MGhK6s9R2EPJjAIxAPSVHmywgq3LuwC
0KamxIRVH5jsw/5OC1Kc89NpjN3yRFwV0K0i0UvIPAZqx/fJETKCAvae+zhXDnHy
Y0Ae408sVNC8M9OJBagStflSj+Hpw0TDuQkRp1DEjWSl/ZtVTjg=
=VsIU
-----END PGP SIGNATURE-----

--- End Message ---

Reply to: