Package: gitpkg
Version: 0.14
Severity: normal

There is a conflict between 1) "find" is used to locate the sources, and so any 
source
files in eg. out/attic/ (which happens to be what I use) get located (which is 
inself
could be a pleasant feature), and 2) dpkg --compare-version is done on the full 
path of
the source files.

Another issue occurs with ((--j)) being non-zero when j reaches zero (when the 
1st revision
was not first in the initial sort).

This patch appears to deal with the above issues:

diff --git a/git-debimport b/git-debimport
index dc1f5f1..3ffc955 100755
--- a/git-debimport
+++ b/git-debimport
@@ -261,7 +261,7 @@ count=${#P[*]}
 for(( i=1; i < count; ++i )) do
     j=i
     #echo "was $i: ${P[i]}"
-    while (($j)) && $COMPARE "${P[j-1]%.diff.gz}" gt "${P[i]%.diff.gz}"; do 
((--j)); done
+    while (($j)) && Vi=${P[i]##*_} && Vj1=${P[j-1]##*_} && $COMPARE 
"${Vj1%.diff.gz}" gt "${Vi%.diff.gz}"; do ((--j)) || true; done
     ((i==j)) || P=( $...@]:0:j} ${P[i]} ${P[j]} $...@]:j+1:i-(j+1)} 
$...@]:i+1} )
 done
 #for(( i=1; i < count; ++i )) do echo "now $i: ${P[i]}"; done

Another issue is that for diffs found in a subdir, the orig tarball should 
probably be searched
in the subdir as well:

tar: ../../memtest86+_1.00.orig.tar.gz: Cannot open: No such file or directory

Also, the quick pre-sort obviously implies you consider me to be in the Bad 
Guys category -
I did not attempt to address that one.


Well, for the time being, symlinking everyone into a new dir will do the trick  
 
(note that it could be a general solution to all the problems listed here).

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (101, 
'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32.13-evms (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages gitpkg depends on:
ii  dpkg-dev                      1.15.7.2   Debian package development tools
ii  git [git-core]                1:1.7.1-1  fast, scalable, distributed revisi
ii  git-core                      1:1.7.1-1  fast, scalable, distributed revisi

gitpkg recommends no packages.

Versions of packages gitpkg suggests:
ii  devscripts                    2.10.64    scripts to make the life of a Debi

-- no debconf information



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to