From 49a3ada01a67589b61633e558e081db388d322d8 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sat, 23 Oct 2010 18:26:02 +0200 Subject: Allow repoman to commit files, which have changes only in SVN properties. --- bin/repoman | 6 +++--- pym/repoman/utilities.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/repoman b/bin/repoman index 55b67e6bc..0cdc0db8b 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2148,9 +2148,9 @@ else: if vcs == "svn": svnstatus = os.popen("svn status").readlines() - mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ] - mynew = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ] - myremoved = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("D") ] + mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and (elem[0] in "MR" or elem[1] in "M")] + mynew = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A")] + myremoved = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("D")] # in contrast to CVS, SVN expands nothing by default. # bin_blobs historically # were just there to see what files need to be checked for diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py index 5d32e0ce9..953c3cd2b 100644 --- a/pym/repoman/utilities.py +++ b/pym/repoman/utilities.py @@ -1,5 +1,5 @@ # repoman: Utilities -# Copyright 2007 Gentoo Foundation +# Copyright 2007-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 """This module contains utility functions to help repoman find ebuilds to @@ -75,7 +75,7 @@ def detect_vcs_conflicts(options, vcs): for line in mylines: if not line: continue - if line[0] not in "UPMARD": # Updates,Patches,Modified,Added,Removed/Replaced(svn),Deleted(svn) + if line[0] not in " UPMARD": # unmodified(svn),Updates,Patches,Modified,Added,Removed/Replaced(svn),Deleted(svn) # Stray Manifest is fine, we will readd it anyway. if line[0] == '?' and line[1:].lstrip() == 'Manifest': continue -- cgit v1.2.3-1-g7c22