From bcf9772206eb52d50a4bc14801e33cc111db616f Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 22 Dec 2010 20:53:38 +0200 Subject: [PATCH] edit-patch: Don't let cat error through if debian/source/format doesn't exist. --- debian/changelog | 6 ++++-- edit-patch | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a2c7f7b..74e527f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low + Return 0 after showing help. * ubuntutools/common.py: Remove https_proxy unsetting code, working around LP: #94130. + * edit-patch: Don't let cat error through if debian/source/format doesn't + exist. [ Michael Bienia ] * ubuntutools/lp/lpapicache.py: Allow easier selection of 'staging' as LP @@ -37,12 +39,12 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low * Recommend bzr-builddeb (used by sponsor-patch for branches). * Add most dependencies to Build-Depends for successfully run the tests. * Depend on python-gnupginterface (used by dgetlp). - + [ Michael Vogt ] * add "add-patch" that provides the non-interactive version of edit-patch - -- Benjamin Drung Wed, 22 Dec 2010 19:16:56 +0100 + -- Stefano Rivera Wed, 22 Dec 2010 20:52:28 +0200 ubuntu-dev-tools (0.108) experimental; urgency=low diff --git a/edit-patch b/edit-patch index 14cd8e8..671c7ba 100755 --- a/edit-patch +++ b/edit-patch @@ -64,8 +64,8 @@ detect_patchsystem() { elif [ -e debian/patches/00list ]; then PATCHSYSTEM="dpatch" require_installed dpatch-edit-patch "no dpatch-edit-patch found, is 'dpatch' installed?" - elif [ -e debian/patches/series -o \( \ - -e debian/source/format -a "$(cat debian/source/format)" = "3.0 (quilt)" \) ]; then + elif [ -e debian/patches/series -o \ + "$(cat debian/source/format 2> /dev/null)" = "3.0 (quilt)" ]; then PATCHSYSTEM="quilt" require_installed quilt "no quilt found, is 'quilt' installed?" else