Package: git-stuff
Version: 14-1
Severity: normal
Tags: patch

Hello Daniel,

git-upstream-tar leaves the .orig suffix when importing orig.tar.xz files.
I think, the different extraction of the version string for xz files is caused 
by a typo.
Ptach attached.


-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'stable'), (400, 'unstable'), (300, 
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to de_DE.UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages git-stuff depends on:
ii  debconf [debconf-2.0]  1.5.49
ii  git                    1:1.7.10.4-1+wheezy1

Versions of packages git-stuff recommends:
ii  cron              3.0pl1-124
ii  git-buildpackage  0.6.0~git20120601
ii  mr                1.12
ii  pristine-tar      1.25

Versions of packages git-stuff suggests:
pn  gitstats  <none>
pn  irker     <none>

-- debconf information:
  git-repack-repositories/cron: @monthly
* git-stuff/bash-profile: true
* git-repack-repositories/enable: false
  git-repack-repositories/title:
  git-stuff/title:
  git-repack-repositories/directories: /srv/git
*** git-upstream-tar.old	2012-11-13 18:48:00.000000000 +0100
--- git-upstream-tar	2013-02-16 10:57:21.000000000 +0100
***************
*** 17,23 ****
  	exit 1
  fi
  
! VERSION="$(basename ${TARBALL} | awk -F_ '{ print $2 }' | sed -e 's|.orig.tar.gz||' -e 's|.tar.gz||' -e 's|.orig.tar.bz2||' -e 's|.tar.bz2||' -e 's|.orig.xz||' -e 's|.tar.xz||' -e 's|.orig.tar.lz||' -e 's|.tar.lz||')"
  
  if ! git branch | grep -qs upstream
  then
--- 17,23 ----
  	exit 1
  fi
  
! VERSION="$(basename ${TARBALL} | awk -F_ '{ print $2 }' | sed -e 's|.orig.tar.gz||' -e 's|.tar.gz||' -e 's|.orig.tar.bz2||' -e 's|.tar.bz2||' -e 's|.orig.tar.xz||' -e 's|.tar.xz||' -e 's|.orig.tar.lz||' -e 's|.tar.lz||')"
  
  if ! git branch | grep -qs upstream
  then

Reply via email to