Package: cvsps
Version: 2.1-5
Severity: normal
Tags: patch

There is a bug that the strip_path gets not correct recognized when
importing a whole CVS repository to git.

I did a patch to fix that issue at least when the repository to work on
is ".". It fixes not all problems with that strange path mangling but it
helps to get around of it.

-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (800, 'stable'), (700, 'testing'), (600, 'unstable'), (60, 
'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/dash
Kernel: Linux 2.4.37
Locale: LANG=de_DE, LC_CTYPE=de_DE (charmap=ISO-8859-1) (ignored: LC_ALL set to 
de_DE)

Versions of packages cvsps depends on:
ii  cvs                    1:1.12.13-8       Concurrent Versions System
ii  libc6                  2.3.6.ds1-13etch8 GNU C Library: Shared libraries
ii  zlib1g                 1:1.2.3-13        compression library - runtime

cvsps recommends no packages.

-- no debconf information

-- 
Klaus Ethgen                            http://www.ethgen.de/
pub  2048R/D1A4EDE5 2000-02-26 Klaus Ethgen <kl...@ethgen.de>
Fingerprint: D7 67 71 C4 99 A6 D4 FE  EA 40 30 57 3C 88 26 2B
diff -u cvsps-2.1/debian/changelog cvsps-2.1/debian/changelog
--- cvsps-2.1/debian/changelog
+++ cvsps-2.1/debian/changelog
@@ -1,3 +1,10 @@
+cvsps (2.1-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix the ugly strip_path bug.
+
+ -- Klaus Ethgen <kl...@ethgen.de>  Sun, 18 Jan 2009 17:46:55 +0100
+
 cvsps (2.1-5) unstable; urgency=low
 
   * Sync from Ubuntu to Debian, fixing 64-bit issue in Debian (Closes: #489219)
only in patch2:
unchanged:
--- cvsps-2.1.orig/cvsps.c
+++ cvsps-2.1/cvsps.c
@@ -1041,7 +1041,10 @@
      * from the 'nominal' repository path because of symlinks in the server and 
      * the like.  See also the 'parse_file' routine
      */
-    strip_path_len = snprintf(strip_path, PATH_MAX, "%s/%s/", p, repository_path);
+    if (strncmp(repository_path, ".", 1) == 0)
+       strip_path_len = snprintf(strip_path, PATH_MAX, "%s/", p);
+    else
+       strip_path_len = snprintf(strip_path, PATH_MAX, "%s/%s/", p, repository_path);
 
     if (strip_path_len < 0 || strip_path_len >= PATH_MAX)
     {

Attachment: signature.asc
Description: Digital signature

Reply via email to