RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-Aug-2013 23:44:28
Branch: rpm-5_4 Handle: 2013080421442700
Modified files: (Branch: rpm-5_4)
rpm/tools .cvsignore Makefile.am roto.c
Log:
- tools: scrub out some bit root.
Summary:
Revision Changes Path
1.50.2.2 +1 -0 rpm/tools/.cvsignore
2.170.2.8 +10 -6 rpm/tools/Makefile.am
1.1.2.4 +2 -1 rpm/tools/roto.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/.cvsignore
============================================================================
$ cvs diff -u -r1.50.2.1 -r1.50.2.2 .cvsignore
--- rpm/tools/.cvsignore 5 Sep 2011 12:43:10 -0000 1.50.2.1
+++ rpm/tools/.cvsignore 4 Aug 2013 21:44:27 -0000 1.50.2.2
@@ -48,5 +48,6 @@
txar
wget
xiu-echo
+xiu-hash
xiu-instantiate
xiu-store
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.170.2.7 -r2.170.2.8 Makefile.am
--- rpm/tools/Makefile.am 4 May 2012 15:58:08 -0000 2.170.2.7
+++ rpm/tools/Makefile.am 4 Aug 2013 21:44:27 -0000 2.170.2.8
@@ -24,11 +24,15 @@
EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh
-EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \
- nix-build nix-channel nix-collect-garbage nix-copy-closure \
- nix-env nix-hash nix-install-package nix-instantiate \
- nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \
- xiu-echo xiu-hash xiu-instantiate xiu-store \
+EXTRA_PROGRAMS = nix-copy-closure nix-env nix-hash nix-install-package \
+ nix-instantiate nix-store nix-worker \
+ xiu-instantiate xiu-store
+noinst_PROGRAMS =
+
+EXTRA_PROGRAMS += augtool cudftool dbconvert debugedit \
+ nix-build nix-channel nix-collect-garbage \
+ nix-log2xml nix-prefetch-url nix-pull nix-push \
+ xiu-echo xiu-hash \
roto rpmkey sandbox semodule spooktool
RPMMISC_LDADD_COMMON = \
@@ -64,7 +68,7 @@
endif
dist_man_MANS = rpmgrep.1
-noinst_PROGRAMS = grep
+noinst_PROGRAMS += grep
augtool_SOURCES = augtool.c
augtool_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/roto.c
============================================================================
$ cvs diff -u -r1.1.2.3 -r1.1.2.4 roto.c
--- rpm/tools/roto.c 4 Jun 2012 15:10:41 -0000 1.1.2.3
+++ rpm/tools/roto.c 4 Aug 2013 21:44:27 -0000 1.1.2.4
@@ -1669,6 +1669,7 @@
fh.setFormatter(formatter)
fh.setLevel(logging.NOTSET)
log.addHandler(fh)
+#endif /* REFERENCE */
rpmlog(RPMLOG_INFO, "Mock Version: %s\n", roto->version);
/* finally: */
xx = uidManagerRestorePrivs(roto);
@@ -3541,7 +3542,7 @@
#ifdef REFERENCE
roto->chrootgid = grp.getgrnam("mock")[2]
except KeyError:
- # 'mock' group doesn't exist, must set in config file
+ # mock group doesn't exist, must set in config file
pass
#else
{ struct group * gr = getgrnam("mock");
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
