RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm-5_3: rpm/tests/ Makefile.am

From: Jeff Johnson <jbj@rpm5.org>
Date: Sun 26 Sep 2010 - 20:52:57 CEST
Message-Id: <20100926185257.11B1ED9E43@rpm5.org>
  RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   26-Sep-2010 20:52:57
  Branch: rpm-5_3                          Handle: 2010092618525600

  Modified files:           (Branch: rpm-5_3)
    rpm/tests               Makefile.am

  Log:
    - tests: strip out comments in control manifests.

  Summary:
    Revision    Changes     Path
    1.63.2.24   +2  -1      rpm/tests/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.63.2.23 -r1.63.2.24 Makefile.am
  --- rpm/tests/Makefile.am	26 Sep 2010 14:01:32 -0000	1.63.2.23
  +++ rpm/tests/Makefile.am	26 Sep 2010 18:52:56 -0000	1.63.2.24
  @@ -421,6 +421,7 @@
   MOBLIN_mirror =	http://mirrors.kernel.org/moblin/releases
   MOBLIN21_uri =	$(MOBLIN_mirror)/2.1/ia32/os/i586/ \
   		$(MOBLIN_mirror)/2.1/ia32/os/noarch/
  +MOBLIN21_manifest = $(testdir)/ref/moblin21-everything.manifest
   # MOMONGA -- Momonga Linux
   MOMONGA_mirror = http://dist.momonga-linux.org/pub/momonga
   MOMONGA7_uri =	$(MOMONGA_mirror)/7/Momonga/i686/os/Packages/
  @@ -503,7 +504,7 @@
   	  for U in ${$(@D)_uri}; do echo "$${U}" >> ${@D}/uri; done; \
   	  if [ -z "${${@D}_manifest}" ]; \
   	    then ${find} ${$(@D)_uri} -maxdepth 1 | grep 'rpm$$' > $@; \
  -	    else cp ${${@D}_manifest} $@; \
  +	    else grep -v '^#' ${${@D}_manifest} > $@; \
   	  fi; \
   	  ./devtool ${@D} > ${@D}/distros.mongo; \
   	  ls -l ${@D}/uri $@ ${@D}/distros.mongo; \
  @@ .
Received on Sun Sep 26 20:52:57 2010
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.