>From 8ae621a6d193c937ed8475a2f85c8742c567fc72 Mon Sep 17 00:00:00 2001 From: Yury V. Zaytsev Date: Sun, 19 Dec 2010 16:39:04 +0100 Subject: [PATCH 1/4] Streamline support for compression algorithms --- git-debimport | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/git-debimport b/git-debimport index 8feaeee..3ba9125 100755 --- a/git-debimport +++ b/git-debimport @@ -138,6 +138,8 @@ get_native_sources() get_debian_sources() { echo "$(find $1 -type f -name "${2}_*.diff.gz" \ + -o -name "${2}_*.diff.bz2" \ + -o -name "${2}_*.diff.xz" \ -o -name "${2}_*.debian.tar.gz" \ -o -name "${2}_*.debian.tar.bz2" \ -o -name "${2}_*.debian.tar.xz" \ @@ -152,7 +154,7 @@ PACKAGE_DIFFS="$(get_debian_sources "$PACKAGES_DIR" "$PACKAGE_NAME")" if [ -z "$PACKAGE_DIFFS" ] && [ -z "$PACKAGE_TARS" ]; then if [ -z "$fetch_snapshots" ]; then - echo "No ${package_path}_* diff.gz or tar.{gz,bz2,xz} files found, aborting." + echo "No ${package_path}_* diff.{gz,bz2,xz} or tar.{gz,bz2,xz} files found, aborting." exit 1 fi @@ -251,7 +253,7 @@ get_orig_type() elif [ -e "$1.bz2" ]; then echo "bz2" elif [ -e "$1.xz" ]; then - echo "bz2" + echo "xz" else echo "Unable to locate orig '$1.{gz,bz2,xz}'" >&2 exit 1 -- 1.7.3.4