Merge branch 'master' of piny.be:/srv/git/piny-code

Conflicts:
	libpiny/lib/Piny/Repo.pm

1 files changed, 11 insertions, 5 deletions

diff --git a/pinyadmin/sbin/pinyconfig b/pinyadmin/sbin/pinyconfig
index f6752db..e78cf3c 100755
--- a/pinyadmin/sbin/pinyconfig
+++ b/pinyadmin/sbin/pinyconfig
@@ -8,30 +8,36 @@ use Piny;
 my ( $reponame, $attr, $value ) = @ARGV;
 
 if ( not defined $reponame or not defined $attr ) {
-  die "Usage: $0 reponame tweakable [value]\n";
+  die "Usage: $0 reponame|--user tweakable [value]\n";
 };
 
 $attr = lc $attr;
 $attr =~ s/\./_/g;
 
-my $repo = Piny::Repo->new( $reponame );
+my $config;
+
+if ( $reponame eq "--user" ) {
+  $config = Piny::Environment->instance->user->config;
+} else {
+  $config = Piny::Repo->new( $reponame )->config;
+};
 
 if ( defined $value ) {
   undef $@;
   eval {
-    $repo->config->$attr( $value );
+    $config->$attr( $value );
   };
   if ( $@ ) {
     print STDERR "$attr is not a legal tweakable, or $value is not a legal value for that tweakable.\n$@\n";
   };
-  if ( $value ne $repo->config->$attr ) {
+  if ( $value ne $config->$attr ) {
     print STDERR "Failed to set $attr (perhaps an override is in place)\n";
   };
 };
 
 undef $@;
 eval {
-  print "$attr = " . $repo->config->$attr . "\n";
+  print "$attr = " . $config->$attr . "\n";
 };
 if ( $@ ) {
   print STDERR "$attr is not a legal tweakable, or its current value is illegal.\n$@\n";