Patchwork [2,of,2,STABLE] packagelib: do not remove packages directory in hggetversion (issue5262)

login
register
mail settings
Submitter Pierre-Yves David
Date July 28, 2016, 10:52 p.m.
Message ID <1b4090addfa164c900fe.1469746369@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/16003/
State Accepted
Headers show

Comments

Pierre-Yves David - July 28, 2016, 10:52 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1469745924 -7200
#      Fri Jul 29 00:45:24 2016 +0200
# Branch stable
# Node ID 1b4090addfa164c900fe5c866976c99de729b82c
# Parent  a52f8af0393b37ab6ddd8de4d91ee7d9cf2c36aa
packagelib: do not remove packages directory in hggetversion (issue5262)

People running packages related code probably do care about the content of this
directory. In particular this shound fix the rpm builder process.
Sean Farley - July 28, 2016, 11:13 p.m.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> writes:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
> # Date 1469745924 -7200
> #      Fri Jul 29 00:45:24 2016 +0200
> # Branch stable
> # Node ID 1b4090addfa164c900fe5c866976c99de729b82c
> # Parent  a52f8af0393b37ab6ddd8de4d91ee7d9cf2c36aa
> packagelib: do not remove packages directory in hggetversion (issue5262)
>
> People running packages related code probably do care about the content of this
> directory. In particular this shound fix the rpm builder process.

Just did a preliminary run with the ppa stuff I wrote and this seems to work.

Patch

diff -r a52f8af0393b -r 1b4090addfa1 contrib/packagelib.sh
--- a/contrib/packagelib.sh	Fri Jul 29 00:39:59 2016 +0200
+++ b/contrib/packagelib.sh	Fri Jul 29 00:45:24 2016 +0200
@@ -8,7 +8,7 @@ 
 #
 # node: the node|short hg was built from, or empty if built from a tag
 gethgversion() {
-    make clean
+    make cleanbutpackages
     make local || make local PURE=--pure
     HG="$PWD/hg"