Bug#731623: mercurial: recent change in debian/rules causes error on repeated builds

2013-12-07 Thread Faheem Mitha


On Sun, 8 Dec 2013, Faheem Mitha wrote:


On Sat, 7 Dec 2013, Faheem Mitha wrote:



The



   rm tests/test-check-pyflakes.t



breaks repeated builds for me here, specifically `debuild
clean`. Obvious comment: rm returns an error if the file it is asked
to remove does not exist, and once it has been removed, it is not
going to be restored.



Changing this to



   rm -f tests/test-check-pyflakes.t



Fixes it for me.



On second thoughts, maybe patching out that file would be a cleaner solution.


#debian-mentors disagrees. They suggested two alternative slight 
modifications to your version.


override_dh_clean:
dh_clean tests/test-check-pyflakes.t

or perhaps better, just add tests/test-check-pyflakes.t in debian/clean

Regards, Faheem


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



Bug#731623: mercurial: recent change in debian/rules causes error on repeated builds

2013-12-07 Thread Faheem Mitha


On Sat, 7 Dec 2013, Faheem Mitha wrote:


The

   rm tests/test-check-pyflakes.t

breaks repeated builds for me here, specifically `debuild
clean`. Obvious comment: rm returns an error if the file it is asked
to remove does not exist, and once it has been removed, it is not
going to be restored.

Changing this to

   rm -f tests/test-check-pyflakes.t

Fixes it for me.


On second thoughts, maybe patching out that file would be a cleaner solution.

 Regards, Faheem


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



Bug#731623: mercurial: recent change in debian/rules causes error on repeated builds

2013-12-07 Thread Faheem Mitha
Package: mercurial
Version: 2.8.1-1
Severity: normal
Tags: patch

In rev 10223 of


svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/debian

i.e.

r10223 | mithrandi | 2013-12-06 04:44:57 +0530 (Fri, 06 Dec 2013) | 1 line
Changed paths:
   M /packages/mercurial/trunk/debian/changelog
   M /packages/mercurial/trunk/debian/rules

Remove pyflakes test to avoid build failures when pyflakes is installed.


there is the following change


Index: rules
===
--- rules   (revision 10222)
+++ rules   (revision 10223)
@@ -94,6 +94,10 @@
mv mercurial/__version__.py.save mercurial/__version__.py
$(RM) -rv tmp/
 
+override_dh_clean:
+   dh_clean
+   rm tests/test-check-pyflakes.t
+
 mercurial/__version__.py:
@echo "$@ is missing (you probably call 'make clean' directly)."
@echo "Restore it from sources before building the package"


The

rm tests/test-check-pyflakes.t

breaks repeated builds for me here, specifically `debuild
clean`. Obvious comment: rm returns an error if the file it is asked
to remove does not exist, and once it has been removed, it is not
going to be restored.

Changing this to

rm -f tests/test-check-pyflakes.t

Fixes it for me.

  Regards, Faheem

-- System Information:
Debian Release: 7.2
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable'), (500, 'oldstable'), 
(50, 'unstable'), (50, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/6 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


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