summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-11-15 12:24:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-11-15 12:24:27 +0000
commit3e374c857eccccc6929f86daea3da51e3dd6f7f1 (patch)
tree33aad4edcf9e2da2158da92c9c01221c88b2aa56
parentba69827bc5850d8e2ffa3c83bd1cfc5b95eb8c5d (diff)
downloadperl-MDK-Common-3e374c857eccccc6929f86daea3da51e3dd6f7f1.tar
perl-MDK-Common-3e374c857eccccc6929f86daea3da51e3dd6f7f1.tar.gz
perl-MDK-Common-3e374c857eccccc6929f86daea3da51e3dd6f7f1.tar.bz2
perl-MDK-Common-3e374c857eccccc6929f86daea3da51e3dd6f7f1.tar.xz
perl-MDK-Common-3e374c857eccccc6929f86daea3da51e3dd6f7f1.zip
*** empty log message ***
-rw-r--r--perl_checker.src/parser.mly2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl_checker.src/parser.mly b/perl_checker.src/parser.mly
index d9ef7b2..6e76ad6 100644
--- a/perl_checker.src/parser.mly
+++ b/perl_checker.src/parser.mly
@@ -323,7 +323,7 @@ arrayref:
| arrayref_start BRACKET expr BRACKET_END ARRAYREF_END {sp_p($2); sp_p($4); sp_0($5); fst $1 @ [Ref(I_hash, sndfst $3)], pos_range $1 $5}
parenthesized:
| parenthesized_start PAREN_END {sp_0_or_cr($2); ((if fst $1 = [] then P_tok else P_paren P_comma), fst $1), pos_range $1 $2}
-| parenthesized_start expr PAREN_END {sp_0_or_cr($3); (P_paren(if fst $1 = [] then fstfst $2 else P_comma), fst $1 @ [sndfst $2]), pos_range $1 $3}
+| parenthesized_start expr PAREN_END {sp_0_or_cr($3); (P_paren(if fst $1 = [] then fstfst $2 else P_comma), fst $1 @ [(if fst $1 = [] then prio_lo P_loose else prio_lo_after P_comma) $2]), pos_range $1 $3}
| parenthesized_start BRACKET expr BRACKET_END PAREN_END {sp_p($4); sp_0_or_cr($5); (P_paren(if fst $1 = [] then P_expr else P_comma), fst $1 @ [Ref(I_hash, sndfst $3)]), pos_range $1 $5}
arrayref_start:
0.0%;'/>
2 files changed, 1 insertions, 11 deletions
diff --git a/MgaRepo/commands/putsrpm.py b/MgaRepo/commands/putsrpm.py
index 68d87d0..9e9faa7 100644
--- a/MgaRepo/commands/putsrpm.py
+++ b/MgaRepo/commands/putsrpm.py
@@ -11,9 +11,6 @@ Usage: mgarepo putsrpm [OPTIONS] SOURCERPMS
Will import source RPMs into the SVN repository.
-If the package was already imported, it will add the new files and remove
-those not present in the source RPM.
-
Options:
-m LOG Log message used when commiting changes
-t Create version-release tag on releases/
diff --git a/MgaRepo/rpmutil.py b/MgaRepo/rpmutil.py
index 2bf3ef4..80a14a0 100644
--- a/MgaRepo/rpmutil.py
+++ b/MgaRepo/rpmutil.py
@@ -205,8 +205,6 @@ def put_srpm(srpmfile, markrelease=False, striplog=True, branch=None,
releaseurl = "/".join([versionurl, srpm.release])
currenturl = "/".join([pkgurl, "current"])
currentdir = os.path.join(tmpdir, "current")
- #FIXME when pre-commit hook fails, there's no clear way to know
- # what happened
ret = svn.mkdir(pkgurl, noerror=1, log="Created package directory")
if ret or not svn.ls(currenturl, noerror=1):
svn.checkout(pkgurl, tmpdir)
@@ -217,12 +215,7 @@ def put_srpm(srpmfile, markrelease=False, striplog=True, branch=None,
#svn.commit(tmpdir,log="Created package structure.")
version_exists = 1
else:
- if svn.ls(releaseurl, noerror=1):
- raise Error, "release already exists"
- svn.checkout("/".join([pkgurl, "current"]), tmpdir)
- svn.mkdir(versionurl, noerror=1,
- log="Created directory for version %s." % version)
- currentdir = tmpdir
+ raise Error, "package already exists or error creating package directory"
specsdir = os.path.join(currentdir, "SPECS")
sourcesdir = os.path.join(currentdir, "SOURCES")