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: 07-Jun-2012 16:17:02
Branch: rpm-5_4 Handle: 2012060714165803
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio rpmgit.c tgit.c
Log:
- git: fix: stub-out git_strerror when --without-git.
Summary:
Revision Changes Path
1.3501.2.302+1 -0 rpm/CHANGES
2.1.2.11 +3 -1 rpm/rpmio/rpmgit.c
1.1.2.7 +0 -1 rpm/rpmio/tgit.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.301 -r1.3501.2.302 CHANGES
--- rpm/CHANGES 4 Jun 2012 15:10:01 -0000 1.3501.2.301
+++ rpm/CHANGES 7 Jun 2012 14:16:58 -0000 1.3501.2.302
@@ -1,4 +1,5 @@
5.4.9 -> 5.4.10:
+ - jbj: git: fix: stub-out git_strerror when --without-git.
- devzero2000: fix common misspelling
Based on a nice idea of Jim Meyering.
(http://goo.gl/wLNgV)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgit.c
============================================================================
$ cvs diff -u -r2.1.2.10 -r2.1.2.11 rpmgit.c
--- rpm/rpmio/rpmgit.c 10 Mar 2012 03:23:53 -0000 2.1.2.10
+++ rpm/rpmio/rpmgit.c 7 Jun 2012 14:17:01 -0000 2.1.2.11
@@ -145,6 +145,9 @@
#endif /* defined(WITH_LIBGT2) */
/*==============================================================*/
+#if !defined(WITH_LIBGIT2)
+#define git_strerror(_rc) ""
+#endif
static int Xchkgit(/*@unused@*/ rpmgit git, const char * msg,
int error, int printit,
@@ -154,7 +157,6 @@
int rc = error;
if (printit && rc) {
- /* XXX git_strerror? */
rpmlog(RPMLOG_ERR, "%s:%s:%u: %s(%d): %s\n",
func, fn, ln, msg, rc, git_strerror(rc));
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tgit.c
============================================================================
$ cvs diff -u -r1.1.2.6 -r1.1.2.7 tgit.c
--- rpm/rpmio/tgit.c 10 Mar 2012 03:23:53 -0000 1.1.2.6
+++ rpm/rpmio/tgit.c 7 Jun 2012 14:17:01 -0000 1.1.2.7
@@ -34,7 +34,6 @@
int rc = error;
if (printit && rc) {
- /* XXX git_strerror? */
rpmlog(RPMLOG_ERR, "%s:%s:%u: %s(%d): %s\n",
func, fn, ln, msg, rc, git_strerror(rc));
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
